X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=test%2Fmodule.defs;h=01408234ce6cce3af8784506ac5ef526415640f4;hb=64a48a58d954017539afc5e4f1d5c6201873149e;hp=3eda795093ee62ac756b8c8868b23cb315a6f0ed;hpb=9f2cfdb81c9b40ea164bc25daca45c77ebe376a6;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/test/module.defs b/test/module.defs
index 3eda7950..01408234 100644
--- 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))
 
-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 \
+        a52 avcodec avformat avutil dca dvdnav dvdread faac faad mkv mpeg2 mp3lame mp4v2 \
         ogg samplerate swscale theora vorbis vorbisenc x264 xvidcore, \
         $(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
@@ -28,6 +29,7 @@ TEST.out += $(TEST.c.o)
 TEST.out += $(TEST.exe)
 
 BUILD.out += $(TEST.out)
+BUILD.out += $(TEST.install.exe)
 
 ###############################################################################
 
@@ -38,4 +40,8 @@ ifeq ($(BUILD.system),darwin)
     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