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

Fixes allowing to build latest CVS on windows again

Browse Source
This commit is contained in:
rdb 2009-07-06 14:56:26 +00:00
parent cb4d98f8c9
commit a12727a957
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
makepanda/makepanda.py
View File

@ -498,7 +498,10 @@ def BracketNameWithQuotes(name):
def CompileCxx(obj,src,opts): def CompileCxx(obj,src,opts):
ipath = GetListOption(opts, "DIR:") ipath = GetListOption(opts, "DIR:")
if (COMPILER=="MSVC"): if (COMPILER=="MSVC"):
cmd = "cl /favor:blend /wd4996 /wd4275 /wd4267 /wd4101 /Fo" + obj + " /nologo /c " cmd = "cl "
if (platform.architecture()[0]=="64bit"):
cmd += "/favor:blend "
cmd += "/wd4996 /wd4275 /wd4267 /wd4101 /Fo" + obj + " /nologo /c "
for x in ipath: cmd = cmd + " /I" + x for x in ipath: cmd = cmd + " /I" + x
for (opt,dir) in INCDIRECTORIES: for (opt,dir) in INCDIRECTORIES:
if (opt=="ALWAYS") or (opts.count(opt)): cmd = cmd + ' /I' + BracketNameWithQuotes(dir) if (opt=="ALWAYS") or (opts.count(opt)): cmd = cmd + ' /I' + BracketNameWithQuotes(dir)
@ -966,6 +969,10 @@ def WriteConfigSettings():
dtool_config["HAVE_NET"] = '1' dtool_config["HAVE_NET"] = '1'
# On Windows, there's still an ancient ffmpeg version in thirdparty.
if (PkgSkip("FFMPEG")==0 and not sys.platform.startswith("win")):
dtool_config["HAVE_SWSCALE"] = '1'
if (PkgSkip("NVIDIACG")==0): if (PkgSkip("NVIDIACG")==0):
dtool_config["HAVE_CG"] = '1' dtool_config["HAVE_CG"] = '1'
dtool_config["HAVE_CGGL"] = '1' dtool_config["HAVE_CGGL"] = '1'
@ -1193,11 +1200,15 @@ ConditionalWriteFile(GetOutputDir()+'/include/ctl3d.h', '/* dummy file to make M
# #
######################################################################## ########################################################################
CopyAllFiles(GetOutputDir()+'/include/parser-inc/','dtool/src/parser-inc/') CopyTree(GetOutputDir()+'/include/parser-inc','dtool/src/parser-inc')
MakeDirectory(GetOutputDir()+'/include/parser-inc/openssl')
MakeDirectory(GetOutputDir()+'/include/parser-inc/netinet')
MakeDirectory(GetOutputDir()+'/include/parser-inc/Cg')
CopyAllFiles(GetOutputDir()+'/include/parser-inc/openssl/','dtool/src/parser-inc/') CopyAllFiles(GetOutputDir()+'/include/parser-inc/openssl/','dtool/src/parser-inc/')
CopyAllFiles(GetOutputDir()+'/include/parser-inc/netinet/','dtool/src/parser-inc/') CopyAllFiles(GetOutputDir()+'/include/parser-inc/netinet/','dtool/src/parser-inc/')
CopyFile(GetOutputDir()+'/include/parser-inc/Cg/','dtool/src/parser-inc/cg.h') CopyFile(GetOutputDir()+'/include/parser-inc/Cg/','dtool/src/parser-inc/cg.h')
CopyFile(GetOutputDir()+'/include/parser-inc/Cg/','dtool/src/parser-inc/cgGL.h') CopyFile(GetOutputDir()+'/include/parser-inc/Cg/','dtool/src/parser-inc/cgGL.h')
DeleteCVS(GetOutputDir()+'/include/parser-inc')
######################################################################## ########################################################################
# #

4
makepanda/makepandacore.py
View File

@ -573,10 +573,6 @@ def MakeBuildTree():
MakeDirectory(OUTPUTDIR+"/plugins") MakeDirectory(OUTPUTDIR+"/plugins")
MakeDirectory(OUTPUTDIR+"/modelcache") MakeDirectory(OUTPUTDIR+"/modelcache")
MakeDirectory(OUTPUTDIR+"/include") MakeDirectory(OUTPUTDIR+"/include")
MakeDirectory(OUTPUTDIR+"/include/parser-inc")
MakeDirectory(OUTPUTDIR+"/include/parser-inc/openssl")
MakeDirectory(OUTPUTDIR+"/include/parser-inc/netinet")
MakeDirectory(OUTPUTDIR+"/include/parser-inc/Cg")
MakeDirectory(OUTPUTDIR+"/include/openssl") MakeDirectory(OUTPUTDIR+"/include/openssl")
MakeDirectory(OUTPUTDIR+"/models") MakeDirectory(OUTPUTDIR+"/models")
MakeDirectory(OUTPUTDIR+"/models/audio") MakeDirectory(OUTPUTDIR+"/models/audio")