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

Eliminated CompileRES

Browse Source
This commit is contained in:
Josh Yelon 2005-06-11 18:43:03 +00:00
parent a7a0271835
commit ef6f6ed33e
1 changed files with 3 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
doc/makepanda/makepanda.py
View File

@ -1246,33 +1246,6 @@ def CompileC(obj=0,src=0,ipath=[],opts=[],xdep=[]):
oscmd(cmd) oscmd(cmd)
updatefiledate(wobj) updatefiledate(wobj)
########################################################################
##
## CompileRES
##
## Generate an RES file from a source RC file.
##
########################################################################
def CompileRES(obj=0,src=0,ipath=[],opts=[]):
if ((obj==0)|(src==0)): sys.exit("syntax error in CompileRES directive")
fullsrc = CxxFindSource(src, ipath)
if (fullsrc == 0): sys.exit("Cannot find source file "+src)
obj = PREFIX+"/tmp/"+obj
wdep = CxxCalcDependencies(fullsrc, ipath, [])
if (COMPILER=="MSVC7"):
if (older(obj, wdep)):
cmd = 'rc.exe /d "NDEBUG" /l 0x409'
for x in ipath: cmd = cmd + " /I" + x
cmd = cmd + ' /fo' + obj
cmd = cmd + ' ' + fullsrc
oscmd(cmd)
updatefiledate(obj)
if (COMPILER=="LINUXA"):
sys.exit("Can only compile RES files on Windows.")
######################################################################## ########################################################################
## ##
## Interrogate ## Interrogate
@ -1443,7 +1416,7 @@ def CompileLink(dll=0, obj=[], opts=[], xdep=[]):
cmd = cmd + ' /OUT:' + dll + ' /IMPLIB:' + lib + ' /MAP:NUL' cmd = cmd + ' /OUT:' + dll + ' /IMPLIB:' + lib + ' /MAP:NUL'
if (OMIT.count("PYTHON")==0): cmd = cmd + ' /LIBPATH:' + PREFIX + '/python/libs ' if (OMIT.count("PYTHON")==0): cmd = cmd + ' /LIBPATH:' + PREFIX + '/python/libs '
for x in wobj: cmd = cmd + ' ' + x for x in wobj: cmd = cmd + ' ' + x
if (dll[-4:]==".exe"): cmd = cmd + ' ' + PREFIX + '/tmp/pandaIcon.res' if (dll[-4:]==".exe"): cmd = cmd + ' panda/src/configfiles/pandaIcon.res'
if (opts.count("D3D8") or opts.count("D3D9") or opts.count("DXDRAW") or opts.count("DXSOUND") or opts.count("DXGUID")): if (opts.count("D3D8") or opts.count("D3D9") or opts.count("DXDRAW") or opts.count("DXSOUND") or opts.count("DXGUID")):
cmd = cmd + ' /LIBPATH:"' + DIRECTXSDK + '/lib/x86"' cmd = cmd + ' /LIBPATH:"' + DIRECTXSDK + '/lib/x86"'
cmd = cmd + ' /LIBPATH:"' + DIRECTXSDK + '/lib"' cmd = cmd + ' /LIBPATH:"' + DIRECTXSDK + '/lib"'
@ -1685,17 +1658,6 @@ if (OMIT.count("PYTHON")==0):
ConditionalWriteFile(PREFIX+"/tmp/null.cxx","") ConditionalWriteFile(PREFIX+"/tmp/null.cxx","")
##########################################################################################
#
# If running under windows, compile up the icon.
#
##########################################################################################
if (sys.platform == "win32"):
IPATH=["panda/src/configfiles"]
OPTS=[]
CompileRES(ipath=IPATH, opts=OPTS, src='pandaIcon.rc', obj='pandaIcon.res')
########################################################################################## ##########################################################################################
# #
# Generate direct/__init__.py # Generate direct/__init__.py
@ -5665,11 +5627,11 @@ for VER in ["5", "6", "7"]:
if (OMIT.count("MAX"+VER)==0): if (OMIT.count("MAX"+VER)==0):
IPATH=['pandatool/src/maxegg'] IPATH=['pandatool/src/maxegg']
OPTS=['MAX'+VER, 'NSPR', "WINCOMCTL", "WINCOMDLG", "WINUSER", "MAXEGGDEF"] OPTS=['MAX'+VER, 'NSPR', "WINCOMCTL", "WINCOMDLG", "WINUSER", "MAXEGGDEF"]
CompileRES(ipath=IPATH, opts=OPTS, src='MaxEgg.rc', obj='maxegg'+VER+'_MaxEgg.res') CopyFile(PREFIX+"/tmp/MaxEgg.res", "pandatool/src/maxegg/MaxEgg.res")
CompileC(ipath=IPATH, opts=OPTS, src='maxegg_composite1.cxx',obj='maxegg'+VER+'_composite1.obj') CompileC(ipath=IPATH, opts=OPTS, src='maxegg_composite1.cxx',obj='maxegg'+VER+'_composite1.obj')
CompileLink(opts=OPTS, dll='maxegg'+VER+'.dlo', obj=[ CompileLink(opts=OPTS, dll='maxegg'+VER+'.dlo', obj=[
'maxegg'+VER+'_composite1.obj', 'maxegg'+VER+'_composite1.obj',
'maxegg'+VER+'_MaxEgg.res', 'MaxEgg.res',
'libeggbase.lib', 'libeggbase.lib',
'libprogbase.lib', 'libprogbase.lib',
'libpandatoolbase.lib', 'libpandatoolbase.lib',