TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

More windows debug fixes

Browse Source
This commit is contained in:
rdb 2009-08-03 12:09:44 +00:00
parent c392ec8e8c
commit 1a52b3f65f
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
makepanda/makepanda.py
View File

@ -275,12 +275,8 @@ if (RUNTIME) and (PkgSkip("PLUGIN") or PkgSkip("TINYXML")):
if (COMPILER=="MSVC"): if (COMPILER=="MSVC"):
if (PkgSkip("PYTHON")==0): if (PkgSkip("PYTHON")==0):
if (platform.architecture()[0]=="64bit" and os.path.isdir("thirdparty/win-python-x64")): IncDirectory("ALWAYS", SDK["PYTHON"] + "/include")
IncDirectory("ALWAYS", "thirdparty/win-python-x64/include") LibDirectory("ALWAYS", SDK["PYTHON"] + "/libs")
LibDirectory("ALWAYS", "thirdparty/win-python-x64/libs")
else:
IncDirectory("ALWAYS", "thirdparty/win-python/include")
LibDirectory("ALWAYS", "thirdparty/win-python/libs")
for pkg in PkgListGet(): for pkg in PkgListGet():
if (PkgSkip(pkg)==0): if (PkgSkip(pkg)==0):
if (pkg[:4]=="MAYA"): if (pkg[:4]=="MAYA"):
@ -576,10 +572,10 @@ def CompileCxx(obj,src,opts):
if (opts.count('NOFLOATWARN')): cmd += ' /wd4244 /wd4305' if (opts.count('NOFLOATWARN')): cmd += ' /wd4244 /wd4305'
if (opts.count('MSFORSCOPE')): cmd += ' /Zc:forScope-' if (opts.count('MSFORSCOPE')): cmd += ' /Zc:forScope-'
optlevel = GetOptimizeOption(opts) optlevel = GetOptimizeOption(opts)
if (optlevel==1): cmd += " /MD /Zi /RTCs /GS" if (optlevel==1): cmd += " /MDd /Zi /RTCs /GS"
if (optlevel==2): cmd += " /MD /Zi " if (optlevel==2): cmd += " /MDd /Zi"
if (optlevel==3): cmd += " /MD /Zi /O2 /Ob2 /DFORCE_INLINING " if (optlevel==3): cmd += " /MD /Zi /O2 /Ob2 /DFORCE_INLINING"
if (optlevel==4): cmd += " /MD /Zi /Ox /Ob2 /DFORCE_INLINING /DNDEBUG /GL " if (optlevel==4): cmd += " /MD /Zi /Ox /Ob2 /DFORCE_INLINING /DNDEBUG /GL"
cmd += " /Fd" + obj[:-4] + ".pdb" cmd += " /Fd" + obj[:-4] + ".pdb"
building = GetValueOption(opts, "BUILDING:") building = GetValueOption(opts, "BUILDING:")
if (building): cmd += " /DBUILDING_" + building if (building): cmd += " /DBUILDING_" + building
@ -599,8 +595,8 @@ def CompileCxx(obj,src,opts):
cmd += " -isysroot " + SDK["MACOSX"] + " -arch i386" cmd += " -isysroot " + SDK["MACOSX"] + " -arch i386"
if ("NOPPC" not in opts): cmd += " -arch ppc" if ("NOPPC" not in opts): cmd += " -arch ppc"
optlevel = GetOptimizeOption(opts) optlevel = GetOptimizeOption(opts)
if (optlevel==1): cmd += " -g" if (optlevel==1): cmd += " -g -D_DEBUG"
if (optlevel==2): cmd += " -O1" if (optlevel==2): cmd += " -O1 -D_DEBUG"
if (optlevel==3): cmd += " -O2" if (optlevel==3): cmd += " -O2"
if (optlevel==4): cmd += " -O3 -DNDEBUG" if (optlevel==4): cmd += " -O3 -DNDEBUG"
if (CFLAGS !=""): cmd += " " + CFLAGS if (CFLAGS !=""): cmd += " " + CFLAGS
@ -681,8 +677,8 @@ def CompileIgate(woutd,wsrc,opts):
if (COMPILER=="LINUX") and (platform.architecture()[0]=="32bit"): if (COMPILER=="LINUX") and (platform.architecture()[0]=="32bit"):
cmd += ' -DCPPPARSER -D__STDC__=1 -D__cplusplus -D__inline -D__const=const -D__i386__' cmd += ' -DCPPPARSER -D__STDC__=1 -D__cplusplus -D__inline -D__const=const -D__i386__'
optlevel=GetOptimizeOption(opts) optlevel=GetOptimizeOption(opts)
if (optlevel==1): cmd += ' ' if (optlevel==1): cmd += ' -D_DEBUG'
if (optlevel==2): cmd += ' ' if (optlevel==2): cmd += ' -D_DEBUG'
if (optlevel==3): cmd += ' -DFORCE_INLINING' if (optlevel==3): cmd += ' -DFORCE_INLINING'
if (optlevel==4): cmd += ' -DNDEBUG -DFORCE_INLINING' if (optlevel==4): cmd += ' -DNDEBUG -DFORCE_INLINING'
cmd += ' -oc ' + woutc + ' -od ' + woutd cmd += ' -oc ' + woutc + ' -od ' + woutd
@ -760,14 +756,14 @@ def CompileLink(dll, obj, opts):
cmd = "link /nologo" cmd = "link /nologo"
if (platform.architecture()[0] == "64bit"): if (platform.architecture()[0] == "64bit"):
cmd += " /MACHINE:X64" cmd += " /MACHINE:X64"
cmd += " /NOD:MFC90.LIB /NOD:MFC80.LIB /NOD:LIBCI.LIB /NOD:MSVCRTD.LIB /DEBUG" cmd += " /NOD:MFC90.LIB /NOD:MFC80.LIB /NOD:LIBCI.LIB /DEBUG"
cmd += " /nod:libc /nod:libcmtd /nod:atlthunk /nod:atls" cmd += " /nod:libc /nod:libcmtd /nod:atlthunk /nod:atls"
if (GetOrigExt(dll) != ".exe"): cmd += " /DLL" if (GetOrigExt(dll) != ".exe"): cmd += " /DLL"
optlevel = GetOptimizeOption(opts) optlevel = GetOptimizeOption(opts)
if (optlevel==1): cmd += " /MAP /MAPINFO:EXPORTS" if (optlevel==1): cmd += " /MAP /MAPINFO:EXPORTS /NOD:MSVCRT.LIB"
if (optlevel==2): cmd += " /MAP:NUL " if (optlevel==2): cmd += " /MAP:NUL /NOD:MSVCRT.LIB"
if (optlevel==3): cmd += " /MAP:NUL " if (optlevel==3): cmd += " /MAP:NUL /NOD:MSVCRTD.LIB"
if (optlevel==4): cmd += " /MAP:NUL /LTCG " if (optlevel==4): cmd += " /MAP:NUL /LTCG /NOD:MSVCRTD.LIB"
cmd += " /FIXED:NO /OPT:REF /STACK:4194304 /INCREMENTAL:NO " cmd += " /FIXED:NO /OPT:REF /STACK:4194304 /INCREMENTAL:NO "
cmd += ' /OUT:' + BracketNameWithQuotes(dll) cmd += ' /OUT:' + BracketNameWithQuotes(dll)
if (dll.endswith(".dll")): if (dll.endswith(".dll")):
@ -1007,6 +1003,7 @@ def CompileAnything(target, inputs, opts):
DTOOL_CONFIG=[ DTOOL_CONFIG=[
#_Variable_________________________Windows___________________Unix__________ #_Variable_________________________Windows___________________Unix__________
("HAVE_PYTHON", '1', '1'), ("HAVE_PYTHON", '1', '1'),
("USE_DEBUG_PYTHON", 'UNDEF', 'UNDEF'),
("PYTHON_FRAMEWORK", 'UNDEF', 'UNDEF'), ("PYTHON_FRAMEWORK", 'UNDEF', 'UNDEF'),
("COMPILE_IN_DEFAULT_FONT", '1', '1'), ("COMPILE_IN_DEFAULT_FONT", '1', '1'),
("HAVE_MAYA", '1', '1'), ("HAVE_MAYA", '1', '1'),
@ -1210,6 +1207,9 @@ def WriteConfigSettings():
dtool_config["HAVE_PROC_CURPROC_FILE"] = '1' dtool_config["HAVE_PROC_CURPROC_FILE"] = '1'
dtool_config["HAVE_PROC_CURPROC_MAP"] = '1' dtool_config["HAVE_PROC_CURPROC_MAP"] = '1'
dtool_config["HAVE_PROC_CURPROC_CMDLINE"] = '1' dtool_config["HAVE_PROC_CURPROC_CMDLINE"] = '1'
if (GetOptimize() <= 2 and sys.platform.startswith("win")):
dtool_config["USE_DEBUG_PYTHON"] = '1'
if (GetOptimize() <= 3): if (GetOptimize() <= 3):
if (dtool_config["HAVE_NET"] != 'UNDEF'): if (dtool_config["HAVE_NET"] != 'UNDEF'):