X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=test%2Fmodule.defs;h=c803fcb2302b989c24299aee0dd74fe50591402b;hb=0d4f5926142be762389f82f1c560c67cfd4129b1;hp=234cb1dcfe8f3e16cfce7be9cf83ab21498c2dbc;hpb=ce32291e230fa2ab820ce17c8a5c0cbff3d98e2c;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/test/module.defs b/test/module.defs index 234cb1dc..c803fcb2 100644 --- a/test/module.defs +++ b/test/module.defs @@ -10,13 +10,12 @@ 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 = $(PREFIX/)bin/$(notdir $(TEST.exe)) -## add libs from optional modules ifeq (1,$(BZIP2.enabled)) TEST.libs += $(CONTRIB.build/)lib/libbz2.a endif @@ -37,8 +36,12 @@ BUILD.out += $(TEST.install.exe) 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 +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