diff options
| author | jstebbins <[email protected]> | 2010-03-11 18:33:57 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2010-03-11 18:33:57 +0000 |
| commit | b3c45776b387ebdb4d61b9f24bb03c5c967c1629 (patch) | |
| tree | 8b7c4229441bee6cbd97ebde46c9b05624f851d4 | |
| parent | 84ac0ce3477f03c3781f7b84f0ee6c738dd95224 (diff) | |
disable asserts in libdvdnav except when configured with --debug=max
dvdnav asserts on things are are almost never fatal. so lets not
crash on them.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3159 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | contrib/libdvdnav/module.defs | 4 | ||||
| -rw-r--r-- | make/configure.py | 5 | ||||
| -rw-r--r-- | make/include/gcc.defs | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/contrib/libdvdnav/module.defs b/contrib/libdvdnav/module.defs index 4134146c7..a8f308072 100644 --- a/contrib/libdvdnav/module.defs +++ b/contrib/libdvdnav/module.defs @@ -4,6 +4,10 @@ $(eval $(call import.CONTRIB.defs,LIBDVDNAV)) LIBDVDNAV.FETCH.url = http://download.m0k.org/handbrake/contrib/libdvdnav-svn1168.tar.gz LIBDVDNAV.EXTRACT.tarbase = libdvdnav +ifneq (max,$(GCC.g)) + LIBDVDNAV.CONFIGURE.env.CFLAGS = CFLAGS="-DNDEBUG" +endif + LIBDVDNAV.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache; autoreconf -fiv; LIBDVDNAV.CONFIGURE.extra += --with-dvdread-config=$(call fn.ABSOLUTE,$(CONTRIB.build/)bin/dvdread-config) diff --git a/make/configure.py b/make/configure.py index 628a97a21..27c38014e 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1302,6 +1302,10 @@ try: doc.add( 'XCODE.external.prefix', cfg.xcode_x_prefix ) doc.addMake( '' ) + doc.addMake( '## define debug mode before other includes' ) + doc.addMake( '## since it is tested in some module.defs' ) + doc.add( 'GCC.g', debugMode.mode ) + doc.addBlank() doc.addMake( '## include definitions' ) doc.addMake( 'include $(SRC/)make/include/main.defs' ) @@ -1324,7 +1328,6 @@ try: doc.add( 'GCC.minver', '' ) doc.add( 'GCC.ldsysroot', '$(GCC.sysroot)' ) doc.add( 'GCC.ldminver', '$(GCC.minver)' ) - doc.add( 'GCC.g', debugMode.mode ) doc.add( 'GCC.O', optimizeMode.mode ) if options.enable_asm and not Tools.yasm.fail: diff --git a/make/include/gcc.defs b/make/include/gcc.defs index a9523ddde..c9b82e70a 100644 --- a/make/include/gcc.defs +++ b/make/include/gcc.defs @@ -14,7 +14,9 @@ GCC.minver = GCC.ldminver= GCC.vis = 0 GCC.pic = 0 -GCC.g = none +ifndef GCC.g + GCC.g = none +endif GCC.O = none GCC.D = GCC.I = |