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

updates for msvc7

Browse Source
This commit is contained in:
cxgeorge 2001-11-06 00:20:08 +00:00
parent 4a1632d011
commit ac083bb502
3 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,8 +104,6 @@
//#define FORCE_DEBUG_FLAGS 1 //#define FORCE_DEBUG_FLAGS 1
//#endif //#endif
#define WARNING_LEVEL_FLAG /W3
#if $[TEST_INLINING] #if $[TEST_INLINING]
// /W4 will make MSVC spit out if it inlined a fn or not, but also cause a lot of other spam warnings // /W4 will make MSVC spit out if it inlined a fn or not, but also cause a lot of other spam warnings
#define WARNING_LEVEL_FLAG /W4 #define WARNING_LEVEL_FLAG /W4

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

@ -88,8 +88,6 @@
#include $[THISDIRPREFIX]compilerSettings.pp #include $[THISDIRPREFIX]compilerSettings.pp
#define WARNING_LEVEL_FLAG /W3
#if $[TEST_INLINING] #if $[TEST_INLINING]
// /W4 will make MSVC spit out if it inlined a fn or not, but also cause a lot of other spam warnings // /W4 will make MSVC spit out if it inlined a fn or not, but also cause a lot of other spam warnings
#define WARNING_LEVEL_FLAG /W4 #define WARNING_LEVEL_FLAG /W4

39
dtool/pptempl/compilerSettings.pp
View File

@ -6,6 +6,7 @@
#define COMMONFLAGS /Gi- #define COMMONFLAGS /Gi-
#define OPTFLAGS /O2 /Ob1 /G6 #define OPTFLAGS /O2 /Ob1 /G6
#define OPT1FLAGS /GZ #define OPT1FLAGS /GZ
#define WARNING_LEVEL_FLAG /W3
// Note: Zi cannot be used on multiproc builds with precomp hdrs, Z7 must be used instead // Note: Zi cannot be used on multiproc builds with precomp hdrs, Z7 must be used instead
#defer DEBUGPDBFLAGS /Zi /Fd"$[osfilename $[target:%.obj=%.pdb]]" #defer DEBUGPDBFLAGS /Zi /Fd"$[osfilename $[target:%.obj=%.pdb]]"
@ -24,6 +25,42 @@
// Note: all Opts will link w/debug info now // Note: all Opts will link w/debug info now
#define LINKER_FLAGS /DEBUG /DEBUGTYPE:CV $[PROFILE_FLAG] /MAP $[MAPINFOFLAGS] /fixed:no /incremental:no /WARN:3 #define LINKER_FLAGS /DEBUG /DEBUGTYPE:CV $[PROFILE_FLAG] /MAP $[MAPINFOFLAGS] /fixed:no /incremental:no /WARN:3
// in case we have mixed intel/msvc build
#define EXTRA_LIBPATH /ia32/lib
#define EXTRA_INCPATH /ia32/include
#elif $[eq $[USE_COMPILER], MSVC7]
#define COMPILER cl
#define LINKER link
#define LIBBER lib
// this is too late it must be
#define UNKNOWN_ALLOCATOR 1
#define COMMONFLAGS /DHAVE_DINKUM
#define OPTFLAGS /O2 /Ob1 /G6
#define OPT1FLAGS /GZ /GS
// #define WARNING_LEVEL_FLAG /Wall //this is scary
#define WARNING_LEVEL_FLAG /W3 // WL
// Note: Zi cannot be used on multiproc builds with precomp hdrs, Z7 must be used instead
#defer DEBUGPDBFLAGS /Zi /Fd"$[osfilename $[target:%.obj=%.pdb]]"
#defer DEBUGFLAGS /MDd $[BROWSEINFO_FLAG] $[DEBUGINFOFLAGS] $[DEBUGPDBFLAGS]
#define RELEASEFLAGS /MD
#define MAPINFOFLAGS /MAPINFO:EXPORTS /MAPINFO:LINES
#if $[ENABLE_PROFILING]
#define PROFILE_FLAG /FIXED:NO
#else
#define PROFILE_FLAG
#endif
// Note: all Opts will link w/debug info now
#define LINKER_FLAGS /DEBUG $[PROFILE_FLAG] /MAP $[MAPINFOFLAGS] /fixed:no /incremental:no
// in case we have mixed intel/msvc build // in case we have mixed intel/msvc build
#define EXTRA_LIBPATH /ia32/lib #define EXTRA_LIBPATH /ia32/lib
#define EXTRA_INCPATH /ia32/include #define EXTRA_INCPATH /ia32/include
@ -70,6 +107,8 @@
#define DEBUGFLAGS /MDd /Zi /Qinline_debug_info /Oy- #define DEBUGFLAGS /MDd /Zi /Qinline_debug_info /Oy-
#define OPT1FLAGS /GZ /Od #define OPT1FLAGS /GZ /Od
#define RELEASEFLAGS /MD #define RELEASEFLAGS /MD
#define WARNING_LEVEL_FLAG /W3
// We assume the Intel compiler installation dir is mounted as /ia32. // We assume the Intel compiler installation dir is mounted as /ia32.
#define EXTRA_LIBPATH /ia32/lib #define EXTRA_LIBPATH /ia32/lib
#define EXTRA_INCPATH /ia32/include #define EXTRA_INCPATH /ia32/include