diff options
| author | jstebbins <[email protected]> | 2010-05-23 15:38:21 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2010-05-23 15:38:21 +0000 |
| commit | 28658486daa5cd3e7a58edb3539885422889c44f (patch) | |
| tree | 22bd3d2a80d5443584ece6d769cd7d41c53cdfaa /libhb/module.defs | |
| parent | a28717d0b3d41674934d6e0e24ee70344576fb1e (diff) | |
add ability to probe for existance of headers and libraries to configure.py
use this to check for system versions of bz2 z pthreadGC2 iberty and dl when
building with mingw. solves a problem with conflicts when building on fedora with
a full standard install of their mingw packages.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3316 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/module.defs')
| -rw-r--r-- | libhb/module.defs | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/libhb/module.defs b/libhb/module.defs index e73102c9a..36397e61d 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -89,12 +89,39 @@ LIBHB.dll = $(LIBHB.build/)hb.dll LIBHB.lib = $(LIBHB.build/)hb.lib LIBHB.dll.libs = $(foreach n, \ - a52 bz2 avcodec avformat avutil dca dvdnav dvdread faac faad iconv mkv mpeg2 mp3lame mp4v2 \ - ogg pthreadGC2 samplerate swscale theora vorbis vorbisenc x264 z, \ + 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 ) +ifneq ($(HAS.iconv),1) +LIBHB.dll.libs += $(CONTRIB.build/)lib/libiconv.a +else + LIBHB.GCC.l += iconv +endif + +ifneq ($(HAS.pthread),1) +LIBHB.dll.libs += $(CONTRIB.build/)lib/libpthreadGC2.a +else + LIBHB.GCC.l += pthreadGC2 +endif + +ifneq ($(HAS.bz2),1) +LIBHB.dll.libs += $(CONTRIB.build/)lib/libbz2.a +else + LIBHB.GCC.l += bz2 +endif + +ifneq ($(HAS.libz),1) +LIBHB.dll.libs += $(CONTRIB.build/)lib/libz.a +else + LIBHB.GCC.l += z +endif + LIBHB.GCC.args.extra.dylib++ += -Wl,--out-implib,$(LIBHB.lib) LIBHB.GCC.l += iberty ws2_32 +ifeq ($(HAS.dlfcn),1) + LIBHB.GCC.l += dl +endif LIBHB.out += $(LIBHB.dll) $(LIBHB.lib) endif |