TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

- better error reporting on freezer exit

Browse Source 
- turn off SECURE_SCL to fix compile bug on MSVC10
- add /MANIFEST flag to the linker
- ignore errors on the mt command, because it sometimes returns non-zero when it shouldn't (HACK)
This commit is contained in:
Chris Brunner 2011-11-16 00:37:04 +00:00
parent 59f5b1cadf
commit d30783c8b1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
makepanda/makepanda.py
View File

@ -983,7 +983,7 @@ def CompileLink(dll, obj, opts):
cmd += " /MACHINE:X64"
if ("MFC" not in opts):
cmd += " /NOD:MFC90.LIB /NOD:MFC80.LIB /NOD:LIBCMT"
cmd += " /NOD:LIBCI.LIB /DEBUG"
cmd += " /NOD:LIBCI.LIB /DEBUG /MANIFEST"
cmd += " /nod:libc /nod:libcmtd /nod:atlthunk /nod:atls"
if (GetOrigExt(dll) != ".exe"): cmd += " /DLL"
optlevel = GetOptimizeOption(opts)
@ -1024,7 +1024,7 @@ def CompileLink(dll, obj, opts):
mtcmd = "mt -manifest " + dll + ".manifest -outputresource:" + dll
if (dll.endswith(".exe")==0): mtcmd = mtcmd + ";2"
else: mtcmd = mtcmd + ";1"
oscmd(mtcmd)
oscmd(mtcmd, ignoreError=True) # HACK: For some reason, mt sometimes gives a non-zero return value, even when it works
if (COMPILER=="LINUX"):
cxx = os.environ.get('CXX', 'g++')
if (GetOrigExt(dll)==".exe"): cmd = cxx + ' -o ' + dll + ' -L' + GetOutputDir() + '/lib -L' + GetOutputDir() + '/tmp -L/usr/X11R6/lib'
@ -1182,7 +1182,7 @@ def FreezePy(target, inputs, opts):
del os.environ["LINK_PYTHON_STATIC"]
if (not os.path.exists(target)):
exit("")
exit("FREEZER_ERROR")
##########################################################################################
#
@ -1508,7 +1508,7 @@ DTOOL_CONFIG=[
("HAVE_FCOLLADA", 'UNDEF', 'UNDEF'),
("HAVE_OPENAL_FRAMEWORK", 'UNDEF', 'UNDEF'),
("PRC_SAVE_DESCRIPTIONS", '1', '1'),
("_SECURE_SCL", '1', 'UNDEF'),
("_SECURE_SCL", '0', 'UNDEF'),
("_SECURE_SCL_THROWS", '0', 'UNDEF'),
("HAVE_P3D_PLUGIN", 'UNDEF', 'UNDEF'),
]