mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-06 03:44:00 -04:00
add mapinfo flags
This commit is contained in:
cxgeorge
parent
48dbb8a059
commit
444b9b06fb
@ -117,18 +117,11 @@
|
|||||||
#defer CFLAGS_OPT3 $[CDEFINES_OPT3:%=/D%] $[COMMONFLAGS] $[RELEASEFLAGS] $[OPTFLAGS]
|
#defer CFLAGS_OPT3 $[CDEFINES_OPT3:%=/D%] $[COMMONFLAGS] $[RELEASEFLAGS] $[OPTFLAGS]
|
||||||
#defer CFLAGS_OPT4 $[CDEFINES_OPT4:%=/D%] $[COMMONFLAGS] $[RELEASEFLAGS] $[OPTFLAGS]
|
#defer CFLAGS_OPT4 $[CDEFINES_OPT4:%=/D%] $[COMMONFLAGS] $[RELEASEFLAGS] $[OPTFLAGS]
|
||||||
|
|
||||||
#if $[ENABLE_PROFILING]
|
|
||||||
// note according to docs, this should force /PDB:none /DEBUGTYPE:cv, so no pdb file is generated for debug?? (doesnt seem to be true)
|
|
||||||
#define PROFILE_FLAG /PROFILE
|
|
||||||
#else
|
|
||||||
#define PROFILE_FLAG
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// NODEFAULTLIB ensures static libs linked in will connect to the correct msvcrt, so no debug/release mixing occurs
|
// NODEFAULTLIB ensures static libs linked in will connect to the correct msvcrt, so no debug/release mixing occurs
|
||||||
#defer LDFLAGS_OPT1 /debug /incremental:no /NODEFAULTLIB:MSVCRT.LIB /WARN:3 $[PROFILE_FLAG]
|
#defer LDFLAGS_OPT1 /debug /incremental:no /NODEFAULTLIB:MSVCRT.LIB /WARN:3 $[LINKER_FLAGS]
|
||||||
#defer LDFLAGS_OPT2 /debug /incremental:no /NODEFAULTLIB:MSVCRT.LIB /WARN:3 $[PROFILE_FLAG]
|
#defer LDFLAGS_OPT2 /debug /incremental:no /NODEFAULTLIB:MSVCRT.LIB /WARN:3 $[LINKER_FLAGS]
|
||||||
#defer LDFLAGS_OPT3 /fixed:no /incremental:no /NODEFAULTLIB:MSVCRTD.LIB /WARN:3 $[PROFILE_FLAG] /OPT:REF
|
#defer LDFLAGS_OPT3 /fixed:no /incremental:no /NODEFAULTLIB:MSVCRTD.LIB /WARN:3 $[LINKER_FLAGS] /OPT:REF
|
||||||
#defer LDFLAGS_OPT4 /fixed:no /incremental:no /NODEFAULTLIB:MSVCRTD.LIB /WARN:3 $[PROFILE_FLAG] /OPT:REF
|
#defer LDFLAGS_OPT4 /fixed:no /incremental:no /NODEFAULTLIB:MSVCRTD.LIB /WARN:3 $[LINKER_FLAGS] /OPT:REF
|
||||||
|
|
||||||
// $[build_pdbs] will be nonempty (true) if we should expect to
|
// $[build_pdbs] will be nonempty (true) if we should expect to
|
||||||
// generate a .pdb file when we build a DLL or EXE.
|
// generate a .pdb file when we build a DLL or EXE.
|
||||||
|
|||||||
@ -106,18 +106,12 @@
|
|||||||
#defer CFLAGS_OPT3 $[CDEFINES_OPT3:%=/D%] $[COMMONFLAGS] $[RELEASEFLAGS] $[OPTFLAGS]
|
#defer CFLAGS_OPT3 $[CDEFINES_OPT3:%=/D%] $[COMMONFLAGS] $[RELEASEFLAGS] $[OPTFLAGS]
|
||||||
#defer CFLAGS_OPT4 $[CDEFINES_OPT4:%=/D%] $[COMMONFLAGS] $[RELEASEFLAGS] $[OPTFLAGS]
|
#defer CFLAGS_OPT4 $[CDEFINES_OPT4:%=/D%] $[COMMONFLAGS] $[RELEASEFLAGS] $[OPTFLAGS]
|
||||||
|
|
||||||
#if $[ENABLE_PROFILING]
|
|
||||||
// note according to docs, this should force /PDB:none /DEBUGTYPE:cv, so no pdb file is generated for debug?? (doesnt seem to be true)
|
|
||||||
#define PROFILE_FLAG /PROFILE
|
|
||||||
#else
|
|
||||||
#define PROFILE_FLAG
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// NODEFAULTLIB ensures static libs linked in will connect to the correct msvcrt, so no debug/release mixing occurs
|
// NODEFAULTLIB ensures static libs linked in will connect to the correct msvcrt, so no debug/release mixing occurs
|
||||||
#defer LDFLAGS_OPT1 /debug /incremental:no /NODEFAULTLIB:MSVCRT.LIB /WARN:3 $[PROFILE_FLAG]
|
#defer LDFLAGS_OPT1 /debug /incremental:no /NODEFAULTLIB:MSVCRT.LIB /WARN:3 $[LINKER_FLAGS]
|
||||||
#defer LDFLAGS_OPT2 /debug /incremental:no /NODEFAULTLIB:MSVCRT.LIB /WARN:3 $[PROFILE_FLAG]
|
#defer LDFLAGS_OPT2 /debug /incremental:no /NODEFAULTLIB:MSVCRT.LIB /WARN:3 $[LINKER_FLAGS]
|
||||||
#defer LDFLAGS_OPT3 /fixed:no /incremental:no /NODEFAULTLIB:MSVCRTD.LIB /WARN:3 /OPT:REF $[PROFILE_FLAG]
|
#defer LDFLAGS_OPT3 /fixed:no /incremental:no /NODEFAULTLIB:MSVCRTD.LIB /WARN:3 $[LINKER_FLAGS] /OPT:REF
|
||||||
#defer LDFLAGS_OPT4 /fixed:no /incremental:no /NODEFAULTLIB:MSVCRTD.LIB /WARN:3 /OPT:REF $[PROFILE_FLAG]
|
#defer LDFLAGS_OPT4 /fixed:no /incremental:no /NODEFAULTLIB:MSVCRTD.LIB /WARN:3 $[LINKER_FLAGS] /OPT:REF
|
||||||
|
|
||||||
|
|
||||||
// $[build_pdbs] will be nonempty (true) if we should expect to
|
// $[build_pdbs] will be nonempty (true) if we should expect to
|
||||||
// generate a .pdb file when we build a DLL or EXE.
|
// generate a .pdb file when we build a DLL or EXE.
|
||||||
|
|||||||
@ -1,79 +1,90 @@
|
|||||||
|
|
||||||
#if $[eq $[USE_COMPILER], MSVC]
|
#if $[eq $[USE_COMPILER], MSVC]
|
||||||
#define COMPILER cl
|
#define COMPILER cl
|
||||||
#define LINKER link
|
#define LINKER link
|
||||||
#define LIBBER lib
|
#define LIBBER lib
|
||||||
#define COMMONFLAGS /Gi-
|
#define COMMONFLAGS /Gi-
|
||||||
#define OPTFLAGS /O2 /Ob1 /G6
|
#define OPTFLAGS /O2 /Ob1 /G6
|
||||||
#define OPT1FLAGS /GZ
|
#define OPT1FLAGS /GZ
|
||||||
|
|
||||||
// #defer DEBUGFLAGS /MDd $[BROWSEINFO_FLAG] $[DEBUG_TYPE_FLAGS]
|
// #defer DEBUGFLAGS /MDd $[BROWSEINFO_FLAG] $[DEBUG_TYPE_FLAGS]
|
||||||
#defer DEBUGFLAGS /MDd $[BROWSEINFO_FLAG] /Zi /Fd"$[osfilename $[target:%.obj=%.pdb]]"
|
#defer DEBUGFLAGS /MDd $[BROWSEINFO_FLAG] /Zi /Fd"$[osfilename $[target:%.obj=%.pdb]]"
|
||||||
#define RELEASEFLAGS /MD
|
#define RELEASEFLAGS /MD
|
||||||
|
|
||||||
// in case we have mixed intel/msvc build
|
#define MAPINFOFLAGS /MAPINFO:EXPORTS /MAPINFO:FIXUPS /MAPINFO:LINES
|
||||||
#define EXTRA_LIBPATH /ia32/lib
|
|
||||||
#define EXTRA_INCPATH /ia32/include
|
#if $[ENABLE_PROFILING]
|
||||||
#elif $[eq $[USE_COMPILER], BOUNDS] // NuMega BoundsChecker
|
// note according to docs, this should force /PDB:none /DEBUGTYPE:cv, so no pdb file is generated for debug?? (doesnt seem to be true)
|
||||||
#define COMPILER nmcl
|
#define PROFILE_FLAG /PROFILE
|
||||||
#define LINKER nmlink
|
#else
|
||||||
#define LIBBER lib
|
#define PROFILE_FLAG
|
||||||
#define COMMONFLAGS
|
#endif
|
||||||
#define OPTFLAGS /O2 /Ogity /G6
|
|
||||||
#define OPT1FLAGS /GZ
|
#define LINKER_FLAGS $[PROFILE_FLAG] /MAP $[MAPINFOFLAGS]
|
||||||
#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
|
#define EXTRA_LIBPATH /ia32/lib
|
||||||
#define EXTRA_INCPATH
|
#define EXTRA_INCPATH /ia32/include
|
||||||
#if $[BOUNDS_TRUETIME] // NuMega BoundsChecker TrueTime Profiler
|
#elif $[eq $[USE_COMPILER], BOUNDS] // NuMega BoundsChecker
|
||||||
// This may look like a bad thing (to extend the compiler
|
#define COMPILER nmcl
|
||||||
// and linker with a switch), but I think it's the right
|
#define LINKER nmlink
|
||||||
// thing to do in this case -- skyler.
|
#define LIBBER lib
|
||||||
#define COMPILER $[COMPILER] /NMttOn
|
#define COMMONFLAGS
|
||||||
#define LINKER $[LINKER] /NMttOn
|
#define OPTFLAGS /O2 /Ogity /G6
|
||||||
#endif
|
#define OPT1FLAGS /GZ
|
||||||
#elif $[eq $[USE_COMPILER], TRUETIME] // NuMega TrueTime Profiler
|
#defer DEBUGFLAGS /MDd /Zi $[BROWSEINFO_FLAG] /Fd"$[osfilename $[target:%.obj=%.pdb]]"
|
||||||
// This may look like a bad thing (to extend the compiler
|
#define RELEASEFLAGS /MD
|
||||||
// and linker with a switch), but I think it's the right
|
#define EXTRA_LIBPATH
|
||||||
// thing to do in this case -- skyler.
|
#define EXTRA_INCPATH
|
||||||
#define COMPILER nmcl /NMttOn
|
#if $[BOUNDS_TRUETIME] // NuMega BoundsChecker TrueTime Profiler
|
||||||
#define LINKER nmlink /NMttOn
|
// This may look like a bad thing (to extend the compiler
|
||||||
#define LIBBER lib
|
// and linker with a switch), but I think it's the right
|
||||||
#define COMMONFLAGS
|
// thing to do in this case -- skyler.
|
||||||
#define OPTFLAGS /O2 /Ogity /G6
|
#define COMPILER $[COMPILER] /NMttOn
|
||||||
#define OPT1FLAGS /GZ
|
#define LINKER $[LINKER] /NMttOn
|
||||||
#defer DEBUGFLAGS /MDd /Zi $[BROWSEINFO_FLAG] /Fd"$[osfilename $[target:%.obj=%.pdb]]"
|
#endif
|
||||||
#define RELEASEFLAGS /MD
|
#elif $[eq $[USE_COMPILER], TRUETIME] // NuMega TrueTime Profiler
|
||||||
#define EXTRA_LIBPATH
|
// This may look like a bad thing (to extend the compiler
|
||||||
#define EXTRA_INCPATH
|
// and linker with a switch), but I think it's the right
|
||||||
#elif $[eq $[USE_COMPILER], INTEL]
|
// thing to do in this case -- skyler.
|
||||||
#define COMPILER icl
|
#define COMPILER nmcl /NMttOn
|
||||||
#define LINKER xilink
|
#define LINKER nmlink /NMttOn
|
||||||
#define LIBBER xilib
|
#define LIBBER lib
|
||||||
#define COMMONFLAGS /Gi- /Qwd985
|
#define COMMONFLAGS
|
||||||
// #define OPTFLAGS /O3 /G6 /Qvc6 /Qipo /QaxW /Qvec_report1
|
#define OPTFLAGS /O2 /Ogity /G6
|
||||||
#define OPTFLAGS /O3 /G6 /Qvc6 /Qip
|
#define OPT1FLAGS /GZ
|
||||||
// Oy- needed for MS debugger
|
#defer DEBUGFLAGS /MDd /Zi $[BROWSEINFO_FLAG] /Fd"$[osfilename $[target:%.obj=%.pdb]]"
|
||||||
#define DEBUGFLAGS /MDd /Zi /Qinline_debug_info /Oy-
|
#define RELEASEFLAGS /MD
|
||||||
#define OPT1FLAGS /GZ /Od
|
#define EXTRA_LIBPATH
|
||||||
#define RELEASEFLAGS /MD
|
#define EXTRA_INCPATH
|
||||||
// We assume the Intel compiler installation dir is mounted as /ia32.
|
#elif $[eq $[USE_COMPILER], INTEL]
|
||||||
#define EXTRA_LIBPATH /ia32/lib
|
#define COMPILER icl
|
||||||
#define EXTRA_INCPATH /ia32/include
|
#define LINKER xilink
|
||||||
#else
|
#define LIBBER xilib
|
||||||
#error Invalid value specified for USE_COMPILER.
|
#define COMMONFLAGS /Gi- /Qwd985
|
||||||
#endif
|
// #define OPTFLAGS /O3 /G6 /Qvc6 /Qipo /QaxW /Qvec_report1
|
||||||
|
#define OPTFLAGS /O3 /G6 /Qvc6 /Qip
|
||||||
#if $[CHECK_SYNTAX_ONLY]
|
// Oy- needed for MS debugger
|
||||||
#define END_CFLAGS $[END_CFLAGS] /Zs
|
#define DEBUGFLAGS /MDd /Zi /Qinline_debug_info /Oy-
|
||||||
#endif
|
#define OPT1FLAGS /GZ /Od
|
||||||
|
#define RELEASEFLAGS /MD
|
||||||
#if $[GEN_ASSEMBLY]
|
// We assume the Intel compiler installation dir is mounted as /ia32.
|
||||||
#define END_CFLAGS $[END_CFLAGS] /FAs
|
#define EXTRA_LIBPATH /ia32/lib
|
||||||
#endif
|
#define EXTRA_INCPATH /ia32/include
|
||||||
|
#else
|
||||||
#if $[PREPROCESSOR_OUTPUT]
|
#error Invalid value specified for USE_COMPILER.
|
||||||
#define END_CFLAGS $[END_CFLAGS] /E
|
#endif
|
||||||
#endif
|
|
||||||
|
#if $[CHECK_SYNTAX_ONLY]
|
||||||
|
#define END_CFLAGS $[END_CFLAGS] /Zs
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if $[GEN_ASSEMBLY]
|
||||||
|
#define END_CFLAGS $[END_CFLAGS] /FAs
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if $[PREPROCESSOR_OUTPUT]
|
||||||
|
#define END_CFLAGS $[END_CFLAGS] /E
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user