OSDN Git Service
(root)
/
handbrake-jp
/
handbrake-jp-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Excises xvid from libhb because it's not worthy. Having two different MPEG-4 Part...
[handbrake-jp/handbrake-jp-git.git]
/
test
/
module.defs
diff --git
a/test/module.defs
b/test/module.defs
index
3eda795
..
c803fcb
100644
(file)
--- a/
test/module.defs
+++ b/
test/module.defs
@@
-1,20
+1,21
@@
$(eval $(call import.MODULE.defs,TEST,test,LIBHB))
$(eval $(call import.GCC,TEST))
$(eval $(call import.MODULE.defs,TEST,test,LIBHB))
$(eval $(call import.GCC,TEST))
-TEST.src/ = $(
PROJECT
/)test/
+TEST.src/ = $(
SRC
/)test/
TEST.build/ = $(BUILD/)test/
TEST.c = $(wildcard $(TEST.src/)*.c)
TEST.build/ = $(BUILD/)test/
TEST.c = $(wildcard $(TEST.src/)*.c)
-TEST.c.o = $(patsubst $(
PROJECT
/)%.c,$(BUILD/)%.o,$(TEST.c))
+TEST.c.o = $(patsubst $(
SRC
/)%.c,$(BUILD/)%.o,$(TEST.c))
TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
TEST.libs = $(LIBHB.a) $(foreach n, \
TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
TEST.libs = $(LIBHB.a) $(foreach n, \
- a52 avcodec avformat avutil dca dvdread faac faad mkv mpeg2 mp3lame mp4v2 \
- ogg samplerate swscale theora vorbis vorbisenc x264
xvidcore
, \
+ a52 avcodec avformat avutil dca dvd
nav dvd
read faac faad mkv mpeg2 mp3lame mp4v2 \
+ ogg samplerate swscale theora vorbis vorbisenc x264, \
$(CONTRIB.build/)lib/lib$(n).a )
$(CONTRIB.build/)lib/lib$(n).a )
-## add libs from optional modules
+TEST.install.exe = $(PREFIX/)bin/$(notdir $(TEST.exe))
+
ifeq (1,$(BZIP2.enabled))
TEST.libs += $(CONTRIB.build/)lib/libbz2.a
endif
ifeq (1,$(BZIP2.enabled))
TEST.libs += $(CONTRIB.build/)lib/libbz2.a
endif
@@
-28,14
+29,19
@@
TEST.out += $(TEST.c.o)
TEST.out += $(TEST.exe)
BUILD.out += $(TEST.out)
TEST.out += $(TEST.exe)
BUILD.out += $(TEST.out)
+BUILD.out += $(TEST.install.exe)
###############################################################################
TEST.GCC.I += $(LIBHB.GCC.I)
ifeq ($(BUILD.system),darwin)
###############################################################################
TEST.GCC.I += $(LIBHB.GCC.I)
ifeq ($(BUILD.system),darwin)
- TEST.GCC.f += IOKit CoreServices
+ TEST.GCC.f += IOKit CoreServices
AudioToolbox
TEST.GCC.l += bz2 z
else ifeq ($(BUILD.system),linux)
TEST.GCC.l += bz2 z pthread dl m
TEST.GCC.l += bz2 z
else ifeq ($(BUILD.system),linux)
TEST.GCC.l += bz2 z pthread dl m
+else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
+ TEST.libs += $(CONTRIB.build/)lib/libpthreadGC2.a
+ TEST.GCC.D += PTW32_STATIC_LIB
+ TEST.GCC.l += iberty ws2_32
endif
endif