TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

move NDEBUG and _DEBUG into dtool_config.h

Browse Source
This commit is contained in:
David Rose 2009-05-27 22:43:40 +00:00
parent c36c340004
commit 040dcfc333
6 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dtool/Config.Linux.pp
View File

@ -66,10 +66,10 @@
// options to interrogate, guaranteeing that the correct interfaces // options to interrogate, guaranteeing that the correct interfaces
// are generated. Do not include -D here; that will be supplied // are generated. Do not include -D here; that will be supplied
// automatically. // automatically.
#defer CDEFINES_OPT1 _DEBUG $[EXTRA_CDEFS] #defer CDEFINES_OPT1 $[EXTRA_CDEFS]
#defer CDEFINES_OPT2 _DEBUG $[EXTRA_CDEFS] #defer CDEFINES_OPT2 $[EXTRA_CDEFS]
#defer CDEFINES_OPT3 $[EXTRA_CDEFS] #defer CDEFINES_OPT3 $[EXTRA_CDEFS]
#defer CDEFINES_OPT4 NDEBUG $[EXTRA_CDEFS] #defer CDEFINES_OPT4 $[EXTRA_CDEFS]
// What additional flags should be passed for each value of OPTIMIZE // What additional flags should be passed for each value of OPTIMIZE
// (above)? We separate out the compiler-optimization flags, above, // (above)? We separate out the compiler-optimization flags, above,

6
dtool/Config.OSX.pp
View File

@ -60,10 +60,10 @@
// options to interrogate, guaranteeing that the correct interfaces // options to interrogate, guaranteeing that the correct interfaces
// are generated. Do not include -D here; that will be supplied // are generated. Do not include -D here; that will be supplied
// automatically. // automatically.
#defer CDEFINES_OPT1 _DEBUG $[EXTRA_CDEFS] $[OSX_CDEFS] #defer CDEFINES_OPT1 $[EXTRA_CDEFS] $[OSX_CDEFS]
#defer CDEFINES_OPT2 _DEBUG $[EXTRA_CDEFS] $[OSX_CDEFS] #defer CDEFINES_OPT2 $[EXTRA_CDEFS] $[OSX_CDEFS]
#defer CDEFINES_OPT3 $[EXTRA_CDEFS] $[OSX_CDEFS] #defer CDEFINES_OPT3 $[EXTRA_CDEFS] $[OSX_CDEFS]
#defer CDEFINES_OPT4 NDEBUG $[EXTRA_CDEFS] $[OSX_CDEFS] #defer CDEFINES_OPT4 $[EXTRA_CDEFS] $[OSX_CDEFS]
// What additional flags should be passed for each value of OPTIMIZE // What additional flags should be passed for each value of OPTIMIZE
// (above)? We separate out the compiler-optimization flags, above, // (above)? We separate out the compiler-optimization flags, above,

9
dtool/LocalSetup.pp
View File

@ -199,6 +199,15 @@
#format straight #format straight
/* dtool_config.h. Generated automatically by $[PPREMAKE] from $[SOURCEFILE]. */ /* dtool_config.h. Generated automatically by $[PPREMAKE] from $[SOURCEFILE]. */
/* Debug / non-debug symbols. OPTIMIZE = $[OPTIMIZE] */
#if $[<= $[OPTIMIZE],2]
#define _DEBUG 1
#elif $[= $[OPTIMIZE],4]
#define NDEBUG 1
#endif
$[cdefine _DEBUG]
$[cdefine NDEBUG]
/* Define if we have Python installed. */ /* Define if we have Python installed. */
$[cdefine HAVE_PYTHON] $[cdefine HAVE_PYTHON]
$[cdefine USE_DEBUG_PYTHON] $[cdefine USE_DEBUG_PYTHON]

8
dtool/pptempl/Global.gmsvc.pp
View File

@ -75,10 +75,10 @@
#endif #endif
// do NOT try to do #defer #defer CDEFINES_OPT1 $[CDEFINES_OPT1] here! it wont let Sources.pp define their own CDEFINES_OPT1! they must use EXTRA_CDEFS! // do NOT try to do #defer #defer CDEFINES_OPT1 $[CDEFINES_OPT1] here! it wont let Sources.pp define their own CDEFINES_OPT1! they must use EXTRA_CDEFS!
#defer CDEFINES_OPT1 $[if $[NO_DEBUG_CDEF],,_DEBUG] $[EXTRA_CDEFS] #defer CDEFINES_OPT1 $[EXTRA_CDEFS]
#defer CDEFINES_OPT2 $[if $[NO_DEBUG_CDEF],,_DEBUG] $[EXTRA_CDEFS] #defer CDEFINES_OPT2 $[EXTRA_CDEFS]
#defer CDEFINES_OPT3 $[EXTRA_CDEFS] #defer CDEFINES_OPT3 $[EXTRA_CDEFS]
#defer CDEFINES_OPT4 NDEBUG $[EXTRA_CDEFS] #defer CDEFINES_OPT4 $[EXTRA_CDEFS]
#defer cdefines $[CDEFINES_OPT$[OPTIMIZE]] #defer cdefines $[CDEFINES_OPT$[OPTIMIZE]]
@ -144,7 +144,7 @@
#defer STATIC_LIB_C++ $[STATIC_LIB_C] #defer STATIC_LIB_C++ $[STATIC_LIB_C]
#defer COMPILE_IDL midl /nologo /env win32 /Oicf $[DECYGWINED_INC_PATHLIST_ARGS] #defer COMPILE_IDL midl /nologo /env win32 /Oicf $[DECYGWINED_INC_PATHLIST_ARGS]
#defer COMPILE_RC rc /R /D "NDEBUG" /L 0x409 $[DECYGWINED_INC_PATHLIST_ARGS] #defer COMPILE_RC rc /R /L 0x409 $[DECYGWINED_INC_PATHLIST_ARGS]
// if we're attached, use dllbase.txt. otherwise let OS loader resolve dll addrspace collisions // if we're attached, use dllbase.txt. otherwise let OS loader resolve dll addrspace collisions
#if $[ne $[CTPROJS],] #if $[ne $[CTPROJS],]

8
dtool/pptempl/Global.msvc.pp
View File

@ -79,10 +79,10 @@
#endif #endif
// do NOT try to do #defer #defer CDEFINES_OPT1 $[CDEFINES_OPT1] here! it wont let Sources.pp define their own CDEFINES_OPT1! they must use EXTRA_CDEFS! // do NOT try to do #defer #defer CDEFINES_OPT1 $[CDEFINES_OPT1] here! it wont let Sources.pp define their own CDEFINES_OPT1! they must use EXTRA_CDEFS!
#defer CDEFINES_OPT1 $[if $[NO_DEBUG_CDEF],,_DEBUG] $[EXTRA_CDEFS] #defer CDEFINES_OPT1 $[EXTRA_CDEFS]
#defer CDEFINES_OPT2 $[if $[NO_DEBUG_CDEF],,_DEBUG] $[EXTRA_CDEFS] #defer CDEFINES_OPT2 $[EXTRA_CDEFS]
#defer CDEFINES_OPT3 $[EXTRA_CDEFS] #defer CDEFINES_OPT3 $[EXTRA_CDEFS]
#defer CDEFINES_OPT4 NDEBUG $[EXTRA_CDEFS] #defer CDEFINES_OPT4 $[EXTRA_CDEFS]
// Opt1 /GZ disables OPT flags, so make sure its OPT1 only // Opt1 /GZ disables OPT flags, so make sure its OPT1 only
#defer CFLAGS_OPT1 $[CDEFINES_OPT1:%=/D%] $[COMMONFLAGS] $[DEBUGFLAGS] $[OPT1FLAGS] #defer CFLAGS_OPT1 $[CDEFINES_OPT1:%=/D%] $[COMMONFLAGS] $[DEBUGFLAGS] $[OPT1FLAGS]
@ -139,7 +139,7 @@
#defer STATIC_LIB_C++ $[STATIC_LIB_C] #defer STATIC_LIB_C++ $[STATIC_LIB_C]
#defer COMPILE_IDL midl /nologo /env win32 /Oicf $[DECYGWINED_INC_PATHLIST_ARGS] #defer COMPILE_IDL midl /nologo /env win32 /Oicf $[DECYGWINED_INC_PATHLIST_ARGS]
#defer COMPILE_RC rc /R /D "NDEBUG" /L 0x409 $[DECYGWINED_INC_PATHLIST_ARGS] #defer COMPILE_RC rc /R /L 0x409 $[DECYGWINED_INC_PATHLIST_ARGS]
// if we're attached, use dllbase.txt. otherwise let OS loader resolve dll addrspace collisions // if we're attached, use dllbase.txt. otherwise let OS loader resolve dll addrspace collisions
#if $[ne $[CTPROJS],] #if $[ne $[CTPROJS],]

8
dtool/pptempl/Global.nmake.pp
View File

@ -79,10 +79,10 @@
#endif #endif
// do NOT try to do #defer #defer CDEFINES_OPT1 $[CDEFINES_OPT1] here! it wont let Sources.pp define their own CDEFINES_OPT1! they must use EXTRA_CDEFS! // do NOT try to do #defer #defer CDEFINES_OPT1 $[CDEFINES_OPT1] here! it wont let Sources.pp define their own CDEFINES_OPT1! they must use EXTRA_CDEFS!
#defer CDEFINES_OPT1 $[if $[NO_DEBUG_CDEF],,_DEBUG] $[EXTRA_CDEFS] #defer CDEFINES_OPT1 $[EXTRA_CDEFS]
#defer CDEFINES_OPT2 $[if $[NO_DEBUG_CDEF],,_DEBUG] $[EXTRA_CDEFS] #defer CDEFINES_OPT2 $[EXTRA_CDEFS]
#defer CDEFINES_OPT3 $[EXTRA_CDEFS] #defer CDEFINES_OPT3 $[EXTRA_CDEFS]
#defer CDEFINES_OPT4 NDEBUG $[EXTRA_CDEFS] #defer CDEFINES_OPT4 $[EXTRA_CDEFS]
// Opt1 /GZ disables OPT flags, so make sure its OPT1 only // Opt1 /GZ disables OPT flags, so make sure its OPT1 only
#defer CFLAGS_OPT1 $[CDEFINES_OPT1:%=/D%] $[COMMONFLAGS] $[DEBUGFLAGS] $[OPT1FLAGS] #defer CFLAGS_OPT1 $[CDEFINES_OPT1:%=/D%] $[COMMONFLAGS] $[DEBUGFLAGS] $[OPT1FLAGS]
@ -134,7 +134,7 @@
#defer STATIC_LIB_C++ $[STATIC_LIB_C] #defer STATIC_LIB_C++ $[STATIC_LIB_C]
#defer COMPILE_IDL midl /nologo /env win32 /Oicf $[DECYGWINED_INC_PATHLIST_ARGS] #defer COMPILE_IDL midl /nologo /env win32 /Oicf $[DECYGWINED_INC_PATHLIST_ARGS]
#defer COMPILE_RC rc /R /D "NDEBUG" /L 0x409 $[DECYGWINED_INC_PATHLIST_ARGS] #defer COMPILE_RC rc /R /L 0x409 $[DECYGWINED_INC_PATHLIST_ARGS]
// if we're attached, use dllbase.txt. otherwise let OS loader resolve dll addrspace collisions // if we're attached, use dllbase.txt. otherwise let OS loader resolve dll addrspace collisions
#if $[ne $[CTPROJS],] #if $[ne $[CTPROJS],]