mirror of
https://github.com/outbackdingo/UltraGrid.git
synced 2026-03-22 02:40:26 +00:00
build: include vcap testcard in Makefile directly
This commit is contained in:
@@ -198,6 +198,7 @@ COMMON_OBJS = \
|
||||
src/video_capture/import.o \
|
||||
src/video_capture/null.o \
|
||||
src/video_capture/switcher.o \
|
||||
src/video_capture/testcard.o \
|
||||
src/video_capture/testcard_common.o \
|
||||
src/video_capture/ug_input.o \
|
||||
src/video_compress.o \
|
||||
|
||||
@@ -1590,11 +1590,6 @@ AC_ARG_ENABLE(testcard-extras,
|
||||
[testcard_extras_req=$build_default]
|
||||
)
|
||||
|
||||
TESTCARD_OBJ="src/video_capture/testcard.o"
|
||||
TESTCARD_LIB=
|
||||
TESTCARD2_OBJ=
|
||||
TESTCARD2_LIB=
|
||||
|
||||
testcard2_req=auto
|
||||
testcard_sdl_ttf_req=auto
|
||||
|
||||
@@ -1615,9 +1610,6 @@ if expr $testcard_extras_req : '.*ttf' >/dev/null; then
|
||||
testcard_sdl_ttf_req=yes
|
||||
fi
|
||||
|
||||
TESTCARD_OBJ="src/video_capture/testcard.o"
|
||||
ADD_MODULE("vidcap_testcard", "$TESTCARD_OBJ", "$TESTCARD_LIB")
|
||||
|
||||
if test $testcard2_req != no
|
||||
then
|
||||
TESTCARD2_OBJ="src/video_capture/testcard2.o"
|
||||
|
||||
Reference in New Issue
Block a user