mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 10:22:45 -04:00
Whoops, proper fix
This commit is contained in:
parent
0715e7eb14
commit
70f9b632b2
@ -55,58 +55,6 @@ for (ver,key) in MAYAVERSIONINFO:
|
|||||||
for (ver,key1,key2,subdir) in MAXVERSIONINFO:
|
for (ver,key1,key2,subdir) in MAXVERSIONINFO:
|
||||||
MAXVERSIONS.append(ver)
|
MAXVERSIONS.append(ver)
|
||||||
|
|
||||||
########################################################################
|
|
||||||
##
|
|
||||||
## Visual Studio Manifest Manipulation.
|
|
||||||
##
|
|
||||||
########################################################################
|
|
||||||
|
|
||||||
VC90CRTVERSIONRE=re.compile("name=['\"]Microsoft.VC90.CRT['\"]\\s+version=['\"]([0-9.]+)['\"]")
|
|
||||||
|
|
||||||
def GetVC90CRTVersion(fn):
|
|
||||||
manifest = ReadFile(fn)
|
|
||||||
version = VC90CRTVERSIONRE.search(manifest)
|
|
||||||
if (version == None):
|
|
||||||
exit("Cannot locate version number in "+fn)
|
|
||||||
return version.group(1)
|
|
||||||
|
|
||||||
def SetVC90CRTVersion(fn, ver):
|
|
||||||
manifest = ReadFile(fn)
|
|
||||||
subst = " name='Microsoft.VC90.CRT' version='"+ver+"' "
|
|
||||||
manifest = VC90CRTVERSIONRE.sub(subst, manifest)
|
|
||||||
WriteFile(fn, manifest)
|
|
||||||
|
|
||||||
########################################################################
|
|
||||||
##
|
|
||||||
## Thirdparty libraries paths
|
|
||||||
##
|
|
||||||
########################################################################
|
|
||||||
|
|
||||||
if (sys.platform == "win32"):
|
|
||||||
if (platform.architecture()[0] == "64bit"):
|
|
||||||
THIRDPARTYLIBS="thirdparty/win-libs-vc9-x64/"
|
|
||||||
else:
|
|
||||||
THIRDPARTYLIBS="thirdparty/win-libs-vc9/"
|
|
||||||
if not os.path.isdir(THIRDPARTYLIBS):
|
|
||||||
THIRDPARTYLIBS="thirdparty/win-libs-vc9/"
|
|
||||||
VC90CRTVERSION = GetVC90CRTVersion(THIRDPARTYLIBS+"extras/bin/Microsoft.VC90.CRT.manifest")
|
|
||||||
else:
|
|
||||||
if (sys.platform == "darwin"):
|
|
||||||
THIRDPARTYLIBS="thirdparty/darwin-libs-a/"
|
|
||||||
elif (sys.platform.startswith("linux")):
|
|
||||||
if (platform.architecture()[0] == "64bit"):
|
|
||||||
THIRDPARTYLIBS="thirdparty/linux-libs-x64/"
|
|
||||||
else:
|
|
||||||
THIRDPARTYLIBS="thirdparty/linux-libs-a/"
|
|
||||||
elif (sys.platform.startswith("freebsd")):
|
|
||||||
if (platform.architecture()[0] == "64bit"):
|
|
||||||
THIRDPARTYLIBS="thirdparty/freebsd-libs-x64/"
|
|
||||||
else:
|
|
||||||
THIRDPARTYLIBS="thirdparty/freebsd-libs-a/"
|
|
||||||
else:
|
|
||||||
exit("Unknown platform: %s" % sys.platform)
|
|
||||||
VC90CRTVERSION = 0
|
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
##
|
##
|
||||||
## The exit routine will normally
|
## The exit routine will normally
|
||||||
@ -388,6 +336,58 @@ def NeedsBuild(files,others):
|
|||||||
print "%sWARNING:%s file dependencies changed: %s%s%s" % (GetColor("red"), GetColor(), GetColor("green"), str(files), GetColor())
|
print "%sWARNING:%s file dependencies changed: %s%s%s" % (GetColor("red"), GetColor(), GetColor("green"), str(files), GetColor())
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
########################################################################
|
||||||
|
##
|
||||||
|
## Visual Studio Manifest Manipulation.
|
||||||
|
##
|
||||||
|
########################################################################
|
||||||
|
|
||||||
|
VC90CRTVERSIONRE=re.compile("name=['\"]Microsoft.VC90.CRT['\"]\\s+version=['\"]([0-9.]+)['\"]")
|
||||||
|
|
||||||
|
def GetVC90CRTVersion(fn):
|
||||||
|
manifest = ReadFile(fn)
|
||||||
|
version = VC90CRTVERSIONRE.search(manifest)
|
||||||
|
if (version == None):
|
||||||
|
exit("Cannot locate version number in "+fn)
|
||||||
|
return version.group(1)
|
||||||
|
|
||||||
|
def SetVC90CRTVersion(fn, ver):
|
||||||
|
manifest = ReadFile(fn)
|
||||||
|
subst = " name='Microsoft.VC90.CRT' version='"+ver+"' "
|
||||||
|
manifest = VC90CRTVERSIONRE.sub(subst, manifest)
|
||||||
|
WriteFile(fn, manifest)
|
||||||
|
|
||||||
|
########################################################################
|
||||||
|
##
|
||||||
|
## Thirdparty libraries paths
|
||||||
|
##
|
||||||
|
########################################################################
|
||||||
|
|
||||||
|
if (sys.platform == "win32"):
|
||||||
|
if (platform.architecture()[0] == "64bit"):
|
||||||
|
THIRDPARTYLIBS="thirdparty/win-libs-vc9-x64/"
|
||||||
|
else:
|
||||||
|
THIRDPARTYLIBS="thirdparty/win-libs-vc9/"
|
||||||
|
if not os.path.isdir(THIRDPARTYLIBS):
|
||||||
|
THIRDPARTYLIBS="thirdparty/win-libs-vc9/"
|
||||||
|
VC90CRTVERSION = GetVC90CRTVersion(THIRDPARTYLIBS+"extras/bin/Microsoft.VC90.CRT.manifest")
|
||||||
|
else:
|
||||||
|
if (sys.platform == "darwin"):
|
||||||
|
THIRDPARTYLIBS="thirdparty/darwin-libs-a/"
|
||||||
|
elif (sys.platform.startswith("linux")):
|
||||||
|
if (platform.architecture()[0] == "64bit"):
|
||||||
|
THIRDPARTYLIBS="thirdparty/linux-libs-x64/"
|
||||||
|
else:
|
||||||
|
THIRDPARTYLIBS="thirdparty/linux-libs-a/"
|
||||||
|
elif (sys.platform.startswith("freebsd")):
|
||||||
|
if (platform.architecture()[0] == "64bit"):
|
||||||
|
THIRDPARTYLIBS="thirdparty/freebsd-libs-x64/"
|
||||||
|
else:
|
||||||
|
THIRDPARTYLIBS="thirdparty/freebsd-libs-a/"
|
||||||
|
else:
|
||||||
|
exit("Unknown platform: %s" % sys.platform)
|
||||||
|
VC90CRTVERSION = 0
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
##
|
##
|
||||||
## The CXX include cache:
|
## The CXX include cache:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user