X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=test%2Fmodule.defs;h=947bc1591a7fe2b5d8e051d756cb0be8f9cc8a86;hb=f35d39f9adca67471b72f3e47398855d51481f87;hp=01408234ce6cce3af8784506ac5ef526415640f4;hpb=64a48a58d954017539afc5e4f1d5c6201873149e;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/test/module.defs b/test/module.defs index 01408234..947bc159 100644 --- a/test/module.defs +++ b/test/module.defs @@ -11,11 +11,14 @@ TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI) TEST.libs = $(LIBHB.a) $(foreach n, \ a52 avcodec avformat avutil dca dvdnav dvdread faac faad mkv mpeg2 mp3lame mp4v2 \ - ogg samplerate swscale theora vorbis vorbisenc x264 xvidcore, \ + ogg samplerate swscale theora vorbis vorbisenc x264, \ $(CONTRIB.build/)lib/lib$(n).a ) -TEST.install.exe = $(PREFIX/)bin/$(notdir $(TEST.exe)) +TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe)) +ifeq (1,$(LIBICONV.enabled)) + TEST.libs += $(CONTRIB.build/)lib/libiconv.a +endif ifeq (1,$(BZIP2.enabled)) TEST.libs += $(CONTRIB.build/)lib/libbz2.a endif @@ -36,8 +39,8 @@ 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))