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

Experimenting with disabling manifests entirely

Browse Source
This commit is contained in:
Josh Yelon 2007-04-10 18:13:12 +00:00
parent 0c5b3eb47c
commit fcc960bff8
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
doc/makepanda/makepanda.py
View File

@ -990,9 +990,9 @@ def CompileCxxMSVC(wobj,fullsrc,ipath,opts):
if (opts.count("MSFORSCOPE")): cmd = cmd + ' /Zc:forScope-' if (opts.count("MSFORSCOPE")): cmd = cmd + ' /Zc:forScope-'
optlevel = getoptlevel(opts,OPTIMIZE) optlevel = getoptlevel(opts,OPTIMIZE)
if (optlevel==1): cmd = cmd + " /MD /Zi /RTCs /GS" if (optlevel==1): cmd = cmd + " /MD /Zi /RTCs /GS"
if (optlevel==2): cmd = cmd + " /MD /Zi " if (optlevel==2): cmd = cmd + " /MD /Zi /DNDEBUG "
if (optlevel==3): cmd = cmd + " /MD /Zi /O2 /Ob2 /DFORCE_INLINING " if (optlevel==3): cmd = cmd + " /MD /Zi /O2 /Ob2 /DFORCE_INLINING /DNDEBUG "
if (optlevel==4): cmd = cmd + " /MD /Zi /Ox /Ob2 /DFORCE_INLINING /GL " if (optlevel==4): cmd = cmd + " /MD /Zi /Ox /Ob2 /DFORCE_INLINING /DNDEBUG /GL "
cmd = cmd + " /Fd" + wobj[:-4] + ".pdb" cmd = cmd + " /Fd" + wobj[:-4] + ".pdb"
building = getbuilding(opts) building = getbuilding(opts)
if (building): cmd = cmd + " /DBUILDING_" + building if (building): cmd = cmd + " /DBUILDING_" + building
@ -1013,9 +1013,9 @@ def CompileCxxLINUX(wobj,fullsrc,ipath,opts):
if (opts.count("WITHINPANDA")): cmd = cmd + ' -DWITHIN_PANDA' if (opts.count("WITHINPANDA")): cmd = cmd + ' -DWITHIN_PANDA'
optlevel = getoptlevel(opts,OPTIMIZE) optlevel = getoptlevel(opts,OPTIMIZE)
if (optlevel==1): cmd = cmd + " -g" if (optlevel==1): cmd = cmd + " -g"
if (optlevel==2): cmd = cmd + " -O1" if (optlevel==2): cmd = cmd + " -O1 -DNDEBUG"
if (optlevel==3): cmd = cmd + " -O2" if (optlevel==3): cmd = cmd + " -O2 -DNDEBUG"
if (optlevel==4): cmd = cmd + " -O2" if (optlevel==4): cmd = cmd + " -O2 -DNDEBUG"
building = getbuilding(opts) building = getbuilding(opts)
if (building): cmd = cmd + " -DBUILDING_" + building if (building): cmd = cmd + " -DBUILDING_" + building
cmd = cmd + ' ' + fullsrc cmd = cmd + ' ' + fullsrc
@ -1300,7 +1300,7 @@ def EnqueueLib(lib=0, obj=[], opts=[]):
######################################################################## ########################################################################
def CompileLinkMSVC(wdll, wlib, wobj, opts, dll, ldef): def CompileLinkMSVC(wdll, wlib, wobj, opts, dll, ldef):
cmd = 'link /nologo /NODEFAULTLIB:LIBCI.LIB /NODEFAULTLIB:MSVCRTD.LIB /DEBUG ' cmd = 'link /nologo /NODEFAULTLIB:LIBCI.LIB /NODEFAULTLIB:MSVCRTD.LIB /DEBUG /MANIFEST:NO '
if (THIRDPARTYLIBS=="thirdparty/win-libs-vc8/"): cmd = cmd + " /nod:libc /nod:libcmtd" if (THIRDPARTYLIBS=="thirdparty/win-libs-vc8/"): cmd = cmd + " /nod:libc /nod:libcmtd"
if (wdll[-4:]!=".exe"): cmd = cmd + " /DLL" if (wdll[-4:]!=".exe"): cmd = cmd + " /DLL"
optlevel = getoptlevel(opts,OPTIMIZE) optlevel = getoptlevel(opts,OPTIMIZE)
@ -1377,10 +1377,10 @@ def CompileLinkMSVC(wdll, wlib, wobj, opts, dll, ldef):
cmd = cmd + ' "' + MAXSDK["MAX"+ver] + '/lib/maxutil.lib"' cmd = cmd + ' "' + MAXSDK["MAX"+ver] + '/lib/maxutil.lib"'
cmd = cmd + ' "' + MAXSDK["MAX"+ver] + '/lib/paramblk2.lib"' cmd = cmd + ' "' + MAXSDK["MAX"+ver] + '/lib/paramblk2.lib"'
oscmd(cmd) oscmd(cmd)
mtcmd = 'mt -manifest ' + wdll + '.manifest -outputresource:' + wdll # mtcmd = 'mt -manifest ' + wdll + '.manifest -outputresource:' + wdll
if (wdll[-4:]!=".exe"): mtcmd = mtcmd + ';2' # if (wdll[-4:]!=".exe"): mtcmd = mtcmd + ';2'
else: mtcmd = mtcmd + ';1' # else: mtcmd = mtcmd + ';1'
oscmd(mtcmd) # oscmd(mtcmd)
def CompileLinkLINUX(wdll, obj, wobj, opts, dll, ldef): def CompileLinkLINUX(wdll, obj, wobj, opts, dll, ldef):
if (dll[-4:]==".exe"): cmd = 'g++ -o ' + wdll + ' -Lbuilt/lib -L/usr/X11R6/lib' if (dll[-4:]==".exe"): cmd = 'g++ -o ' + wdll + ' -Lbuilt/lib -L/usr/X11R6/lib'