TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for running makepanda with cygwin Python, fixes for compiling on 32-bits Windows for 64-bits Windows

Browse Source
This commit is contained in:
rdb 2013-08-28 09:01:03 +00:00
parent f251e29237
commit 1b3e62ebb9
2 changed files with 89 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
makepanda/makepanda.py
View File

@ -262,12 +262,15 @@ def parseopts(args):
SetTarget(target, target_arch)
is_win7 = False
if sys.platform.startswith("win"):
if GetHost() == "windows":
if (STRMSPLATFORMVERSION not in ['winserver2003r2', 'win60A']):
platsdk = GetRegistryKey("SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v7.1", "InstallationFolder")
winver = sys.getwindowsversion()
if platsdk and os.path.isdir(platsdk) and winver[0] >= 6 and winver[1] >= 1:
is_win7 = True
if sys.platform == "win32":
# Note: not available in cygwin.
winver = sys.getwindowsversion()
if platsdk and os.path.isdir(platsdk) and winver[0] >= 6 and winver[1] >= 1:
is_win7 = True
if not is_win7:
PkgDisable("TOUCHINPUT")
@ -289,7 +292,7 @@ if ("LDFLAGS" in os.environ):
LDFLAGS = LDFLAGS.strip()
os.environ["MAKEPANDA"] = os.path.abspath(sys.argv[0])
if (sys.platform == "darwin" and OSXTARGET != None):
if (GetHost() == "darwin" and OSXTARGET != None):
os.environ["MACOSX_DEPLOYMENT_TARGET"] = OSXTARGET
########################################################################
@ -318,6 +321,8 @@ MAJOR_VERSION = VERSION[:3]
if (P3DSUFFIX is None):
P3DSUFFIX = MAJOR_VERSION
outputdir_suffix = ""
if (RUNTIME or RTDIST):
# Compiling Maya/Max is pointless in rtdist build
for ver in MAYAVERSIONS + MAXVERSIONS:
@ -326,16 +331,20 @@ if (RUNTIME or RTDIST):
if (DISTRIBUTOR.strip() == ""):
exit("You must provide a valid distributor name when making a runtime or rtdist build!")
if (not IsCustomOutputDir()):
if (RTDIST):
SetOutputDir("built_" + DISTRIBUTOR.strip())
elif (RUNTIME):
SetOutputDir("built_" + DISTRIBUTOR.strip() + "_rt")
outputdir_suffix += "_" + DISTRIBUTOR.strip()
if (RUNTIME):
outputdir_suffix += "_rt"
RTDIST_VERSION = DISTRIBUTOR.strip() + "_" + MAJOR_VERSION
elif (DISTRIBUTOR == ""):
DISTRIBUTOR = "makepanda"
if not IsCustomOutputDir():
if GetTarget() == "windows" and GetTargetArch() == 'x64':
outputdir_suffix += '_x64'
SetOutputDir("built" + outputdir_suffix)
if (RUNTIME):
for pkg in PkgListGet():
if pkg in ["GTK2"]:
@ -628,7 +637,7 @@ if (COMPILER=="GCC"):
if (PkgSkip("PYTHON")==0):
IncDirectory("ALWAYS", SDK["PYTHON"])
if (sys.platform == "darwin"):
if (GetHost() == "darwin"):
if (PkgSkip("FREETYPE")==0):
IncDirectory("FREETYPE", "/usr/X11R6/include")
IncDirectory("FREETYPE", "/usr/X11/include")
@ -639,7 +648,7 @@ if (COMPILER=="GCC"):
IncDirectory("ALWAYS", "/usr/PCBSD/local/include")
LibDirectory("ALWAYS", "/usr/PCBSD/local/lib")
if (sys.platform.startswith("freebsd")):
if (GetHost() == "freebsd"):
IncDirectory("ALWAYS", "/usr/local/include")
LibDirectory("ALWAYS", "/usr/local/lib")
@ -682,7 +691,7 @@ if (COMPILER=="GCC"):
rocket_libs = ("RocketCore", "RocketControls")
if (GetOptimize() <= 3):
rocket_libs += ("RocketDebugger",)
if (sys.platform != "darwin"):
if (GetHost() != "darwin"):
# We use a statically linked libboost_python on OSX
rocket_libs += ("boost_python",)
SmartPkgEnable("ROCKET", "", rocket_libs, "Rocket/Core.h")
@ -692,7 +701,7 @@ if (COMPILER=="GCC"):
SmartPkgEnable("OPENSSL", "openssl", ("ssl", "crypto"), ("openssl/ssl.h", "openssl/crypto.h"))
SmartPkgEnable("PNG", "libpng", ("png"), "png.h", tool = "libpng-config")
SmartPkgEnable("ZLIB", "zlib", ("z"), "zlib.h")
if (RTDIST and sys.platform == "darwin" and "PYTHONVERSION" in SDK):
if (RTDIST and GetHost() == "darwin" and "PYTHONVERSION" in SDK):
# Don't use the framework for the OSX rtdist build. I'm afraid it gives problems somewhere.
SmartPkgEnable("PYTHON", "", SDK["PYTHONVERSION"], (SDK["PYTHONVERSION"], SDK["PYTHONVERSION"] + "/Python.h"), tool = SDK["PYTHONVERSION"] + "-config")
elif("PYTHONVERSION" in SDK and not RUNTIME):
@ -701,12 +710,12 @@ if (COMPILER=="GCC"):
SmartPkgEnable("WX", tool = "wx-config")
SmartPkgEnable("FLTK", "", ("fltk"), ("Fl/Fl.H"), tool = "fltk-config")
if (RUNTIME):
if (sys.platform == 'darwin'):
if (GetHost() == 'darwin'):
SmartPkgEnable("NPAPI", "", (), ("npapi.h"))
if not os.path.isdir(GetThirdpartyDir() + "npapi"):
IncDirectory("NPAPI", "/System/Library/Frameworks/WebKit.framework/Headers")
elif (sys.platform.startswith("freebsd")):
elif (GetHost() == "freebsd"):
SmartPkgEnable("NPAPI", "mozilla-plugin", (), ("libxul/stable", "libxul/stable/npapi.h", "nspr/prtypes.h", "nspr"))
else:
SmartPkgEnable("NPAPI", "mozilla-plugin", (), ("xulrunner-*/stable", "xulrunner-*/stable/npapi.h", "nspr*/prtypes.h", "nspr*"))
@ -732,7 +741,7 @@ if (COMPILER=="GCC"):
for pkg in MAYAVERSIONS:
if (PkgSkip(pkg)==0 and (pkg in SDK)):
if (sys.platform == "darwin"):
if (GetHost() == "darwin"):
# Sheesh, Autodesk really can't make up their mind
# regarding the location of the Maya devkit on OS X.
if (os.path.isdir(SDK[pkg] + "/Maya.app/Contents/lib")):
@ -807,7 +816,7 @@ if (COMPILER=="GCC"):
IncDirectory("PHYSX", SDK["PHYSX"] + "/Foundation/include")
IncDirectory("PHYSX", SDK["PHYSX"] + "/Cooking/include")
LibDirectory("PHYSX", SDK["PHYSXLIBS"])
if (sys.platform == "darwin"):
if (GetHost() == "darwin"):
LibName("PHYSX", SDK["PHYSXLIBS"] + "/osxstatic/PhysXCooking.a")
LibName("PHYSX", SDK["PHYSXLIBS"] + "/osxstatic/PhysXCore.a")
else:
@ -845,7 +854,7 @@ def printStatus(header,warnings):
print("Makepanda: Omit Pkg:",tomit)
if (GENMAN): print("Makepanda: Generate API reference manual")
else : print("Makepanda: Don't generate API reference manual")
if (sys.platform == "win32" and not RTDIST):
if (GetHost() == "windows" and not RTDIST):
if INSTALLER: print("Makepanda: Build installer, using",COMPRESSOR)
else : print("Makepanda: Don't build installer")
print("Makepanda: Version ID: "+VERSION)
@ -1713,7 +1722,7 @@ def CompileAnything(target, inputs, opts, progress = None):
# It must be a simple copy operation.
ProgressOutput(progress, "Copying file", target)
CopyFile(target, infile)
if (origsuffix==".exe" and not sys.platform.startswith("win")):
if (origsuffix==".exe" and GetHost() != "windows"):
os.system("chmod +x \"%s\"" % target)
return
elif (target.endswith("pandac/PandaModules.py")):

91
makepanda/makepandacore.py
View File

@ -241,7 +241,7 @@ def exit(msg = ""):
def GetHost():
"""Returns the host platform, ie. the one we're compiling on."""
if sys.platform == 'win32':
if sys.platform == 'win32' or sys.platform == 'cygwin':
# sys.platform is win32 on 64-bits Windows as well.
return 'windows'
elif sys.platform == 'darwin':
@ -482,9 +482,10 @@ def oscmd(cmd, ignoreError = False):
print(ColorText("red", "Process exited with exit status %d and signal code %d" % ((res & 0xFF00) >> 8, sig)))
if (sig == signal.SIGINT):
exit("keyboard interrupt")
# Don't ask me where the 35584 or 34304 come from...
if (sig == signal.SIGSEGV or res == 35584 or res == 34304):
if (LocateBinary("gdb") and GetVerbose()):
if (LocateBinary("gdb") and GetVerbose() and GetHost() != "windows"):
print(ColorText("red", "Received SIGSEGV, retrieving traceback..."))
os.system("gdb -batch -ex 'handle SIG33 pass nostop noprint' -ex 'set pagination 0' -ex 'run' -ex 'bt full' -ex 'info registers' -ex 'thread apply all backtrace' -ex 'quit' --args %s < /dev/null" % cmd)
else:
@ -808,6 +809,7 @@ def CxxCalcDependencies(srcfile, ipath, ignore):
########################################################################
if sys.platform == "win32":
# Note: not supported on cygwin.
if sys.version_info >= (3, 0):
import winreg
else:
@ -1463,7 +1465,7 @@ def SmartPkgEnable(pkg, pkgconfig = None, libs = None, incs = None, defs = None,
for d, v in defs.values():
DefSymbol(target_pkg, d, v)
return
elif (sys.platform == "darwin" and framework != None):
elif (GetHost() == "darwin" and framework != None):
if (os.path.isdir("/Library/Frameworks/%s.framework" % framework) or
os.path.isdir("/System/Library/Frameworks/%s.framework" % framework) or
os.path.isdir("/Developer/Library/Frameworks/%s.framework" % framework) or
@ -1599,7 +1601,7 @@ def GetSdkDir(sdkname, sdkkey = None):
return sdir
def SdkLocateDirectX( strMode = 'default' ):
if (sys.platform != "win32"): return
if (GetHost() != "windows"): return
if strMode == 'default':
GetSdkDir("directx8", "DX8")
GetSdkDir("directx9", "DX9")
@ -1729,14 +1731,14 @@ def SdkLocateMaya():
if (PkgSkip(ver)==0 and ver not in SDK):
GetSdkDir(ver.lower().replace("x",""), ver)
if (not ver in SDK):
if (sys.platform == "win32"):
if (GetHost() == "windows"):
for dev in ["Alias|Wavefront","Alias","Autodesk"]:
fullkey="SOFTWARE\\"+dev+"\\Maya\\"+key+"\\Setup\\InstallPath"
res = GetRegistryKey(fullkey, "MAYA_INSTALL_LOCATION", override64=False)
if (res != 0):
res = res.replace("\\", "/").rstrip("/")
SDK[ver] = res
elif (sys.platform == "darwin"):
elif (GetHost() == "darwin"):
ddir = "/Applications/Autodesk/maya"+key
if (os.path.isdir(ddir)): SDK[ver] = ddir
else:
@ -1751,7 +1753,7 @@ def SdkLocateMaya():
elif (os.path.isdir(ddir2)): SDK[ver] = ddir2
def SdkLocateMax():
if (sys.platform != "win32"): return
if (GetHost() != "windows"): return
for version,key1,key2,subdir in MAXVERSIONINFO:
if (PkgSkip(version)==0):
if (version not in SDK):
@ -1811,35 +1813,50 @@ def SdkLocatePython(force_use_sys_executable = False):
SDK["PYTHONEXEC"] = os.path.realpath(sys.executable)
def SdkLocateVisualStudio():
if (sys.platform != "win32"): return
if (GetHost() != "windows"): return
vcdir = GetRegistryKey("SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VC7", "10.0")
if (vcdir != 0) and (vcdir[-4:] == "\\VC\\"):
vcdir = vcdir[:-3]
SDK["VISUALSTUDIO"] = vcdir
elif (os.path.isfile("C:\\Program Files\\Microsoft Visual Studio 10.0\\VC\\bin\\cl.exe")):
SDK["VISUALSTUDIO"] = "C:\\Program Files\\Microsoft Visual Studio 10.0\\"
elif (os.path.isfile("C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\bin\\cl.exe")):
SDK["VISUALSTUDIO"] = "C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\"
elif "VCINSTALLDIR" in os.environ:
vcdir = os.environ["VCINSTALLDIR"]
if (vcdir[-3:] == "\\VC"):
vcdir = vcdir[:-2]
elif (vcdir[-4:] == "\\VC\\"):
vcdir = vcdir[:-3]
SDK["VISUALSTUDIO"] = vcdir
def SdkLocateMSPlatform(strMode = 'default'):
if (sys.platform != "win32"): return
platsdk = 0
if (GetHost() != "windows"): return
platsdk = None
platsdk = GetRegistryKey("SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v7.1", "InstallationFolder")
if (platsdk and not os.path.isdir(platsdk)):
platsdk = 0
platsdk = None
if not platsdk:
# Most common location. Worth a try.
platsdk = "C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1"
if not os.path.isdir(platsdk):
platsdk = None
if not platsdk:
exit("Couldn't find Windows SDK v7.1")
if (not platsdk.endswith("\\")):
if not platsdk.endswith("\\"):
platsdk += "\\"
SDK["MSPLATFORM"] = platsdk
def SdkLocateMacOSX(osxtarget = None):
if (sys.platform != "darwin"): return
if (GetHost() != "darwin"): return
if (osxtarget != None):
if (os.path.exists("/Developer/SDKs/MacOSX%su.sdk" % osxtarget)):
SDK["MACOSX"] = "/Developer/SDKs/MacOSX%su.sdk" % osxtarget
@ -1877,14 +1894,14 @@ def SdkLocatePhysX():
# Try to find a PhysX installation on the system.
for (ver, key) in PHYSXVERSIONINFO:
if (sys.platform == "win32"):
if (GetHost() == "windows"):
folders = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\Folders"
for folder in ListRegistryValues(folders):
if folder.endswith("NVIDIA PhysX SDK\\%s\\SDKs\\" % key) or \
folder.endswith("NVIDIA PhysX SDK\\%s_win\\SDKs\\" % key):
SDK["PHYSX"] = folder
return
elif (sys.platform.startswith("linux")):
elif (GetHost() == "linux"):
incpath = "/usr/include/PhysX/%s/SDKs" % key
libpath = "/usr/lib/PhysX/%s" % key
if (os.path.isdir(incpath) and os.path.isdir(libpath)):
@ -1972,7 +1989,7 @@ def SdkAutoDisableDirectX():
for ver in ["DX8","DX9","DIRECTCAM"]:
if (PkgSkip(ver)==0):
if (ver not in SDK):
if (sys.platform.startswith("win")):
if (GetHost() == "windows"):
WARNINGS.append("I cannot locate SDK for "+ver)
WARNINGS.append("I have automatically added this command-line option: --no-"+ver.lower())
PkgDisable(ver)
@ -1982,7 +1999,7 @@ def SdkAutoDisableDirectX():
def SdkAutoDisableMaya():
for (ver,key) in MAYAVERSIONINFO:
if (ver not in SDK) and (PkgSkip(ver)==0):
if (sys.platform == "win32"):
if (GetHost() == "windows"):
WARNINGS.append("The registry does not appear to contain a pointer to the "+ver+" SDK.")
else:
WARNINGS.append("I cannot locate SDK for "+ver)
@ -1992,7 +2009,7 @@ def SdkAutoDisableMaya():
def SdkAutoDisableMax():
for version,key1,key2,subdir in MAXVERSIONINFO:
if (PkgSkip(version)==0) and ((version not in SDK) or (version+"CS" not in SDK)):
if (sys.platform.startswith("win")):
if (GetHost() == "windows"):
if (version in SDK):
WARNINGS.append("Your copy of "+version+" does not include the character studio SDK")
else:
@ -2033,25 +2050,37 @@ def SetupVisualStudioEnviron():
exit("Could not find the Microsoft Platform SDK")
os.environ["VCINSTALLDIR"] = SDK["VISUALSTUDIO"] + "VC"
os.environ["WindowsSdkDir"] = SDK["MSPLATFORM"]
target_suffix = ""
host_suffix = ""
target_arch = GetTargetArch()
if (target_arch == 'x64'):
target_suffix = "\\amd64"
if (GetHostArch() == 'x64'):
host_suffix = "\\amd64"
AddToPathEnv("PATH", SDK["VISUALSTUDIO"] + "VC\\bin"+host_suffix)
# Determine the directories to look in based on the architecture.
arch = GetTargetArch()
bindir = ""
libdir = ""
if (arch == 'x64'):
bindir = 'amd64'
libdir = 'amd64'
elif (arch != 'x86'):
bindir = arch
libdir = arch
if (arch != 'x86' and GetHostArch() == 'x86'):
# Special version of the tools that run on x86.
bindir = 'x86_' + bindir
binpath = SDK["VISUALSTUDIO"] + "VC\\bin\\" + bindir
if not os.path.isdir(binpath):
exit("Couldn't find compilers in %s. You may need to install the Windows SDK 7.1 and the Visual C++ 2010 SP1 Compiler Update for Windows SDK 7.1.")
AddToPathEnv("PATH", binpath)
AddToPathEnv("PATH", SDK["VISUALSTUDIO"] + "Common7\\IDE")
AddToPathEnv("INCLUDE", SDK["VISUALSTUDIO"] + "VC\\include")
AddToPathEnv("INCLUDE", SDK["VISUALSTUDIO"] + "VC\\atlmfc\\include")
AddToPathEnv("LIB", SDK["VISUALSTUDIO"] + "VC\\lib"+target_suffix)
AddToPathEnv("LIB", SDK["VISUALSTUDIO"] + "VC\\atlmfc\\lib"+target_suffix)
AddToPathEnv("LIB", SDK["VISUALSTUDIO"] + "VC\\lib\\" + libdir)
AddToPathEnv("LIB", SDK["VISUALSTUDIO"] + "VC\\atlmfc\\lib\\" + libdir)
AddToPathEnv("PATH", SDK["MSPLATFORM"] + "bin")
AddToPathEnv("INCLUDE", SDK["MSPLATFORM"] + "include")
AddToPathEnv("INCLUDE", SDK["MSPLATFORM"] + "include\\atl")
AddToPathEnv("INCLUDE", SDK["MSPLATFORM"] + "include\\mfc")
if (target_arch != 'x64'):
if (arch != 'x64'):
AddToPathEnv("LIB", SDK["MSPLATFORM"] + "lib")
AddToPathEnv("PATH",SDK["VISUALSTUDIO"] + "VC\\redist\\x86\\Microsoft.VC100.CRT")
AddToPathEnv("PATH",SDK["VISUALSTUDIO"] + "VC\\redist\\x86\\Microsoft.VC100.MFC")
@ -2189,7 +2218,7 @@ def SetupBuildEnvironment(compiler):
AddToPathEnv("PYTHONPATH", builtdir)
AddToPathEnv("PANDA_PRC_DIR", os.path.join(builtdir, "etc"))
AddToPathEnv("PATH", os.path.join(builtdir, "bin"))
if (sys.platform.startswith("win")):
if (GetHost() == 'windows'):
AddToPathEnv("PATH", os.path.join(builtdir, "plugins"))
AddToPathEnv("PYTHONPATH", os.path.join(builtdir, "bin"))
else:
@ -2275,7 +2304,7 @@ def CopyTree(dstdir, srcdir, omitCVS=True):
if (not omitCVS or entry != "CVS"):
CopyTree(dstpth, srcpth)
else:
if (GetHost() == 'windows'):
if sys.platform == 'win32':
cmd = 'xcopy /I/Y/E/Q "' + srcdir + '" "' + dstdir + '"'
else:
cmd = 'cp -R -f ' + srcdir + ' ' + dstdir