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

fix to mixed build types

Browse Source
This commit is contained in:
cxgeorge 2001-04-11 02:22:11 +00:00
parent b70c6b171d
commit 97efde0fdc
9 changed files with 64 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,47 +75,7 @@
#define dlllib dll #define dlllib dll
#endif #endif
#if $[and $[eq $[USE_COMPILER], INTEL], $[eq $[NOT_INTEL_BUILDABLE], true]] #include $[DTOOL]/pptempl/compilerSettings.pp
#define USE_COMPILER MSVC
#endif
#if $[eq $[USE_COMPILER], MSVC]
#define COMPILER cl
#define LINKER link
#define LIBBER lib
#define COMMONFLAGS /Gi-
#define OPTFLAGS /O2 /Ob1 /G6
#defer DEBUGFLAGS /MDd /Zi $[BROWSEINFO_FLAG] /Fd"$[osfilename $[target:%.obj=%.pdb]]"
#define RELEASEFLAGS /MD
// in case we have mixed intel/msvc build
#define EXTRA_LIBPATH /ia32/lib
#define EXTRA_INCPATH /ia32/include
#elif $[eq $[USE_COMPILER], BOUNDS]
#define COMPILER nmcl
#define LINKER nmlink
#define LIBBER lib
#define COMMONFLAGS
#define OPTFLAGS /O2 /Ogity /G6
#defer DEBUGFLAGS /MDd /Zi $[BROWSEINFO_FLAG] /Fd"$[osfilename $[target:%.obj=%.pdb]]"
#define RELEASEFLAGS /MD
#define EXTRA_LIBPATH
#define EXTRA_INCPATH
#elif $[eq $[USE_COMPILER], INTEL]
#define COMPILER icl
#define LINKER xilink
#define LIBBER xilib
#define COMMONFLAGS /Gi- /Qwd985
// #define OPTFLAGS /O3 /G6 /Qvc6 /Qipo /QaxW /Qvec_report1
#define OPTFLAGS /O3 /G6 /Qvc6 /Qip
#define DEBUGFLAGS /MDd /Zi /Qinline_debug_info
#define RELEASEFLAGS /MD
// We assume the Intel compiler installation dir is mounted as /ia32.
#define EXTRA_LIBPATH /ia32/lib
#define EXTRA_INCPATH /ia32/include
#else
#error Invalid value specified for USE_COMPILER.
#endif
#if $[CHECK_SYNTAX_ONLY] #if $[CHECK_SYNTAX_ONLY]
#define END_CFLAGS $[END_CFLAGS] /Zs #define END_CFLAGS $[END_CFLAGS] /Zs

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

@ -76,45 +76,7 @@
#define CFLAGS_SHARED #define CFLAGS_SHARED
#if $[and $[eq $[USE_COMPILER], INTEL], $[eq $[NOT_INTEL_BUILDABLE], true]] #include $[DTOOL]/pptempl/compilerSettings.pp
#define USE_COMPILER MSVC
#endif
#if $[eq $[USE_COMPILER], MSVC]
#define COMPILER cl
#define LINKER link
#define LIBBER lib
#define COMMONFLAGS /Gi-
#define OPTFLAGS /O2 /Ob1 /G6
#defer DEBUGFLAGS /MDd /Zi $[BROWSEINFO_FLAG] /Fd"$[osfilename $[target:%.obj=%.pdb]]"
#define RELEASEFLAGS /MD
#define EXTRA_LIBPATH
#define EXTRA_INCPATH
#elif $[eq $[USE_COMPILER], BOUNDS]
#define COMPILER nmcl
#define LINKER nmlink
#define LIBBER lib
#define COMMONFLAGS
#define OPTFLAGS /O2 /G6
#defer DEBUGFLAGS /MDd /Zi $[BROWSEINFO_FLAG] /Fd"$[osfilename $[target:%.obj=%.pdb]]"
#define RELEASEFLAGS /MD
#define EXTRA_LIBPATH
#define EXTRA_INCPATH
#elif $[eq $[USE_COMPILER], INTEL]
#define COMPILER icl
#define LINKER xilink
#define LIBBER xilib
#define COMMONFLAGS /Gi-
// #define OPTFLAGS /O3 /G6 /Qvc6 /Qwd985 /Qipo /QaxW /Qvec_report1
#define OPTFLAGS /O3 /G6 /Qvc6 /Qwd985
#define DEBUGFLAGS /MDd /Zi $[BROWSEINFO_FLAG]
#define RELEASEFLAGS /MD
// We assume the Intel compiler installation dir is mounted as /ia32.
#define EXTRA_LIBPATH /ia32/lib
#define EXTRA_INCPATH /ia32/include
#else
#error Invalid value specified for USE_COMPILER.
#endif
#if $[CHECK_SYNTAX_ONLY] #if $[CHECK_SYNTAX_ONLY]
#define END_CFLAGS $[END_CFLAGS] /Zs #define END_CFLAGS $[END_CFLAGS] /Zs

39
dtool/pptempl/compilerSettings.pp Normal file
View File

@ -0,0 +1,39 @@
#if $[eq $[USE_COMPILER], MSVC]
#define COMPILER cl
#define LINKER link
#define LIBBER lib
#define COMMONFLAGS /Gi-
#define OPTFLAGS /O2 /Ob1 /G6
#defer DEBUGFLAGS /MDd /Zi $[BROWSEINFO_FLAG] /Fd"$[osfilename $[target:%.obj=%.pdb]]"
#define RELEASEFLAGS /MD
// in case we have mixed intel/msvc build
#define EXTRA_LIBPATH /ia32/lib
#define EXTRA_INCPATH /ia32/include
#elif $[eq $[USE_COMPILER], BOUNDS]
#define COMPILER nmcl
#define LINKER nmlink
#define LIBBER lib
#define COMMONFLAGS
#define OPTFLAGS /O2 /Ogity /G6
#defer DEBUGFLAGS /MDd /Zi $[BROWSEINFO_FLAG] /Fd"$[osfilename $[target:%.obj=%.pdb]]"
#define RELEASEFLAGS /MD
#define EXTRA_LIBPATH
#define EXTRA_INCPATH
#elif $[eq $[USE_COMPILER], INTEL]
#define COMPILER icl
#define LINKER xilink
#define LIBBER xilib
#define COMMONFLAGS /Gi- /Qwd985
// #define OPTFLAGS /O3 /G6 /Qvc6 /Qipo /QaxW /Qvec_report1
#define OPTFLAGS /O3 /G6 /Qvc6 /Qip
#define DEBUGFLAGS /MDd /Zi /Qinline_debug_info
#define RELEASEFLAGS /MD
// We assume the Intel compiler installation dir is mounted as /ia32.
#define EXTRA_LIBPATH /ia32/lib
#define EXTRA_INCPATH /ia32/include
#else
#error Invalid value specified for USE_COMPILER.
#endif

6
panda/src/chancfg/Sources.pp
View File

@ -1,8 +1,10 @@
#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
dtoolutil:c dtoolbase:c dtool:m dtoolutil:c dtoolbase:c dtool:m
// need to modify global scope #if $[eq $[USE_COMPILER], INTEL]
#set NOT_INTEL_BUILDABLE true #define USE_COMPILER MSVC
#include $[DTOOL]/pptempl/compilerSettings.pp
#endif
#begin lib_target #begin lib_target
#define TARGET chancfg #define TARGET chancfg

6
panda/src/char/Sources.pp
View File

@ -1,8 +1,10 @@
#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
dtoolutil:c dtoolbase:c dtool:m dtoolutil:c dtoolbase:c dtool:m
// need to modify global scope #if $[eq $[USE_COMPILER], INTEL]
#set NOT_INTEL_BUILDABLE true #define USE_COMPILER MSVC
#include $[DTOOL]/pptempl/compilerSettings.pp
#endif
#begin lib_target #begin lib_target
#define TARGET char #define TARGET char

6
panda/src/collide/Sources.pp
View File

@ -1,8 +1,10 @@
#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
dtoolutil:c dtoolbase:c dtool:m dtoolutil:c dtoolbase:c dtool:m
// need to modify global scope #if $[eq $[USE_COMPILER], INTEL]
#set NOT_INTEL_BUILDABLE true #define USE_COMPILER MSVC
#include $[DTOOL]/pptempl/compilerSettings.pp
#endif
#begin lib_target #begin lib_target
#define TARGET collide #define TARGET collide

6
panda/src/device/Sources.pp
View File

@ -1,8 +1,10 @@
#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
dtoolutil:c dtoolbase:c dtool:m dtoolutil:c dtoolbase:c dtool:m
// need to modify global scope #if $[eq $[USE_COMPILER], INTEL]
#set NOT_INTEL_BUILDABLE true #define USE_COMPILER MSVC
#include $[DTOOL]/pptempl/compilerSettings.pp
#endif
#begin lib_target #begin lib_target
#define TARGET device #define TARGET device

6
panda/src/display/Sources.pp
View File

@ -1,8 +1,10 @@
#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
dtoolutil:c dtoolbase:c dtool:m dtoolutil:c dtoolbase:c dtool:m
// need to modify global scope #if $[eq $[USE_COMPILER], INTEL]
#set NOT_INTEL_BUILDABLE true #define USE_COMPILER MSVC
#include $[DTOOL]/pptempl/compilerSettings.pp
#endif
#begin lib_target #begin lib_target
#define TARGET display #define TARGET display

4
panda/src/gui/Sources.pp
View File

@ -1,8 +1,8 @@
#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
dtoolutil:c dtoolbase:c dtool:m dtoolutil:c dtoolbase:c dtool:m
// need to modify global scope #define NOT_INTEL_BUILDABLE true
#set NOT_INTEL_BUILDABLE true $[CheckCompilerCompatibility]
#begin lib_target #begin lib_target
#define TARGET gui #define TARGET gui