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

Fixed a few dx related things.

Browse Source
This commit is contained in:
Josh Yelon 2006-03-20 17:57:35 +00:00
parent a176d3627c
commit 08239df6ab
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
doc/makepanda/makepanda.py
View File

@ -447,8 +447,8 @@ os.chdir(PANDASOURCE)
######################################################################## ########################################################################
if (os.path.isdir("sdks")): if (os.path.isdir("sdks")):
# DIRECTXSDK["DX8"] = "sdks/directx8" DIRECTXSDK["DX8"] = "sdks/directx"
# DIRECTXSDK["DX9"] = "sdks/directx9" DIRECTXSDK["DX9"] = "sdks/directx"
MAXSDKCS["MAX6"] = "sdks/maxsdk6" MAXSDKCS["MAX6"] = "sdks/maxsdk6"
MAXSDKCS["MAX7"] = "sdks/maxsdk7" MAXSDKCS["MAX7"] = "sdks/maxsdk7"
MAXSDKCS["MAX8"] = "sdks/maxsdk8" MAXSDKCS["MAX8"] = "sdks/maxsdk8"
@ -484,12 +484,13 @@ if sys.platform == "win32":
(os.path.isfile(dir+"\\Lib\\x86\\d3dx"+ver+".lib"))): (os.path.isfile(dir+"\\Lib\\x86\\d3dx"+ver+".lib"))):
DIRECTXSDK["DX"+ver] = dir.replace("\\", "/").rstrip("/") DIRECTXSDK["DX"+ver] = dir.replace("\\", "/").rstrip("/")
for ver in DXVERSIONS: for ver in DXVERSIONS:
if (DIRECTXSDK.has_key("DX"+ver)==0) and (OMIT.count("DX"+ver)==0): if (OMIT.count("DX"+ver)==0):
WARNINGS.append("I cannot locate SDK for DX"+ver) if (DIRECTXSDK.has_key("DX"+ver)==0):
WARNINGS.append("I have automatically added this command-line option: --no-dx"+ver) WARNINGS.append("I cannot locate SDK for DX"+ver)
OMIT.append("DX"+ver) WARNINGS.append("I have automatically added this command-line option: --no-dx"+ver)
else: OMIT.append("DX"+ver)
WARNINGS.append("Using DX"+ver+" sdk: "+DIRECTXSDK["DX"+ver]) else:
WARNINGS.append("Using DX"+ver+" sdk: "+DIRECTXSDK["DX"+ver])
######################################################################## ########################################################################
## ##
@ -887,7 +888,8 @@ def CxxCalcDependencies(srcfile, ipath, ignore):
hdeps = CxxCalcDependencies(header, ipath, [srcfile]+ignore) hdeps = CxxCalcDependencies(header, ipath, [srcfile]+ignore)
for x in hdeps: dep[x] = 1 for x in hdeps: dep[x] = 1
else: else:
print "CAUTION: header file "+include+" cannot be found in "+srcfile+" IPATH="+str(ipath) # print "CAUTION: header file "+include+" cannot be found in "+srcfile+" IPATH="+str(ipath)
pass
result = dep.keys() result = dep.keys()
CxxDependencyCache[srcfile] = result CxxDependencyCache[srcfile] = result
return result return result
@ -2316,7 +2318,7 @@ EnqueueIgate(ipath=IPATH, opts=OPTS, outd='libpstatclient.in', obj='libpstatclie
# #
IPATH=['panda/src/gobj'] IPATH=['panda/src/gobj']
OPTS=['BUILDING_PANDA', 'NSPR'] OPTS=['BUILDING_PANDA', 'NSPR', 'ZLIB']
CopyAllHeaders('panda/src/gobj') CopyAllHeaders('panda/src/gobj')
EnqueueCxx(ipath=IPATH, opts=OPTS, src='gobj_composite1.cxx', obj='gobj_composite1.obj') EnqueueCxx(ipath=IPATH, opts=OPTS, src='gobj_composite1.cxx', obj='gobj_composite1.obj')
EnqueueCxx(ipath=IPATH, opts=OPTS, src='gobj_composite2.cxx', obj='gobj_composite2.obj') EnqueueCxx(ipath=IPATH, opts=OPTS, src='gobj_composite2.cxx', obj='gobj_composite2.obj')