diff options
| author | konablend <[email protected]> | 2012-09-08 20:59:47 +0000 |
|---|---|---|
| committer | konablend <[email protected]> | 2012-09-08 20:59:47 +0000 |
| commit | 78f2400f0f78715017c5ee596c717540825f24c4 (patch) | |
| tree | f358d9a406d90cd403801f2bd854e417b1290f35 | |
| parent | 8bdaf62855e06248bdf4c4d5b22d9051f092ad27 (diff) | |
Remove mingw+libmkv dependency on libiberty.
Remove mingw+test dependency on libiberty.
Add build system support for propagating compiler DEFINES to contrib configure.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4942 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | contrib/libmkv/module.defs | 4 | ||||
| -rw-r--r-- | libhb/module.defs | 2 | ||||
| -rw-r--r-- | make/include/contrib.defs | 16 | ||||
| -rw-r--r-- | test/module.defs | 2 |
4 files changed, 14 insertions, 10 deletions
diff --git a/contrib/libmkv/module.defs b/contrib/libmkv/module.defs index f16f7d5ef..9aa4ba1da 100644 --- a/contrib/libmkv/module.defs +++ b/contrib/libmkv/module.defs @@ -4,3 +4,7 @@ $(eval $(call import.CONTRIB.defs,LIBMKV)) LIBMKV.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libmkv-0.6.5-0-g82075ae.tar.gz LIBMKV.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache; mkdir m4; autoreconf -fiv; + +ifeq (mingw,$(BUILD.system)) + LIBMKV.GCC.D += random=rand srandom=srand +endif diff --git a/libhb/module.defs b/libhb/module.defs index 022d30621..e5c5650fa 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -127,7 +127,7 @@ else endif LIBHB.GCC.args.extra.dylib++ += -Wl,--out-implib,$(LIBHB.lib) -LIBHB.GCC.l += iberty ws2_32 +LIBHB.GCC.l += ws2_32 ifeq ($(HAS.dlfcn),1) LIBHB.GCC.l += dl endif diff --git a/make/include/contrib.defs b/make/include/contrib.defs index 963e98226..e49c2fb26 100644 --- a/make/include/contrib.defs +++ b/make/include/contrib.defs @@ -91,18 +91,18 @@ define import.CONTRIB.defs ## debug=max or optimizations=none. Otherwise, use the contribs defaults ifeq (max,$$($(1).GCC.g)) ifeq (none,$$($(1).GCC.O)) - $(1).CONFIGURE.env.CFLAGS = CFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g .O)" - $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g .O)" + $(1).CONFIGURE.env.CFLAGS = CFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g .O *D)" + $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g .O *D)" else - $(1).CONFIGURE.env.CFLAGS = CFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g)" - $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g)" + $(1).CONFIGURE.env.CFLAGS = CFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g *D)" + $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g *D)" endif else - $(1).CONFIGURE.env.CFLAGS = CFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra)" - $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra)" + $(1).CONFIGURE.env.CFLAGS = CFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra *D)" + $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra *D)" endif - $(1).CONFIGURE.env.CPPFLAGS = CPPFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra)" - $(1).CONFIGURE.env.LDFLAGS = LDFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra.exe)" + $(1).CONFIGURE.env.CPPFLAGS = CPPFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra *D)" + $(1).CONFIGURE.env.LDFLAGS = LDFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra.exe *D)" $(1).CONFIGURE.env.PKG_CONFIG_PATH = PKG_CONFIG_PATH="$$(call fn.ABSOLUTE,$$(CONTRIB.build/))lib/pkgconfig" $(1).CONFIGURE.env.args = !CC !CFLAGS !CXX !CXXFLAGS !CPPFLAGS !LDFLAGS !PKG_CONFIG_PATH !LOCAL_PATH diff --git a/test/module.defs b/test/module.defs index 984fe7a08..699007ebe 100644 --- a/test/module.defs +++ b/test/module.defs @@ -68,6 +68,6 @@ ifeq ($(HAS.dlfcn),1) TEST.GCC.l += dl endif TEST.GCC.D += PTW32_STATIC_LIB - TEST.GCC.l += iberty ws2_32 + TEST.GCC.l += ws2_32 TEST.GCC.args.extra.exe++ += -static endif |