X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=test%2Fmodule.defs;h=947bc1591a7fe2b5d8e051d756cb0be8f9cc8a86;hb=f35d39f9adca67471b72f3e47398855d51481f87;hp=a0ab7d0004fbed3f8c8afa583f667b86bf7db698;hpb=86bec131f585eff61acc1d1d3eb5952e20b6b968;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/test/module.defs b/test/module.defs
index a0ab7d00..947bc159 100644
--- a/test/module.defs
+++ b/test/module.defs
@@ -1,22 +1,24 @@
 $(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.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, \
-        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 dvdnav dvdread faac faad mkv mpeg2 mp3lame mp4v2 \
+        ogg samplerate swscale theora vorbis vorbisenc x264, \
         $(CONTRIB.build/)lib/lib$(n).a )
 
-TEST.install.exe = $(INSTALL.prefix/)bin/$(notdir $(TEST.exe))
+TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))
 
-## add libs from optional modules
+ifeq (1,$(LIBICONV.enabled))
+    TEST.libs += $(CONTRIB.build/)lib/libiconv.a
+endif
 ifeq (1,$(BZIP2.enabled))
     TEST.libs += $(CONTRIB.build/)lib/libbz2.a
 endif
@@ -28,17 +30,21 @@ endif
 
 TEST.out += $(TEST.c.o)
 TEST.out += $(TEST.exe)
-TEST.out += $(TEST.install.exe)
 
 BUILD.out += $(TEST.out)
+BUILD.out += $(TEST.install.exe)
 
 ###############################################################################
 
 TEST.GCC.I += $(LIBHB.GCC.I)
 
 ifeq ($(BUILD.system),darwin)
-    TEST.GCC.f += IOKit CoreServices
-    TEST.GCC.l += bz2 z
+    TEST.GCC.f += IOKit CoreServices AudioToolbox
+    TEST.GCC.l += iconv 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