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
LinGui: Add max width/height widgets to preset save dialog
[handbrake-jp/handbrake-jp-git.git]
/
test
/
module.defs
diff --git
a/test/module.defs
b/test/module.defs
index
0140823
..
6fb748e
100644
(file)
--- a/
test/module.defs
+++ b/
test/module.defs
@@
-11,16
+11,26
@@
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 \
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 )
$(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,$(PTHREADW32.enabled))
+ TEST.libs += $(CONTRIB.build/)lib/libpthreadGC2.a
+endif
+ifeq (1,$(LIBICONV.enabled))
+ TEST.libs += $(CONTRIB.build/)lib/libiconv.a
+endif
ifeq (1,$(BZIP2.enabled))
TEST.libs += $(CONTRIB.build/)lib/libbz2.a
ifeq (1,$(BZIP2.enabled))
TEST.libs += $(CONTRIB.build/)lib/libbz2.a
+else
+ TEST.GCC.l += bz2
endif
ifeq (1,$(ZLIB.enabled))
TEST.libs += $(CONTRIB.build/)lib/libz.a
endif
ifeq (1,$(ZLIB.enabled))
TEST.libs += $(CONTRIB.build/)lib/libz.a
+else
+ TEST.GCC.l += z
endif
###############################################################################
endif
###############################################################################
@@
-36,12
+46,23
@@
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.l +=
bz2 z
+ TEST.GCC.f += IOKit CoreServices
AudioToolbox
+ TEST.GCC.l +=
iconv
else ifeq ($(BUILD.system),linux)
else ifeq ($(BUILD.system),linux)
- TEST.GCC.l += bz2 z pthread dl m
+ TEST.GCC.l += pthread dl m
+else ifeq ($(BUILD.system),solaris)
+ TEST.GCC.l += pthread nsl socket
else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
- TEST.libs += $(CONTRIB.build/)lib/libpthreadGC2.a
+ifeq ($(HAS.iconv),1)
+ TEST.GCC.l += iconv
+endif
+ifeq ($(HAS.pthread),1)
+ TEST.GCC.l += pthreadGC2
+endif
+ifeq ($(HAS.dlfcn),1)
+ TEST.GCC.l += dl
+endif
TEST.GCC.D += PTW32_STATIC_LIB
TEST.GCC.l += iberty ws2_32
TEST.GCC.D += PTW32_STATIC_LIB
TEST.GCC.l += iberty ws2_32
+ TEST.GCC.args.extra.exe++ += -static
endif
endif