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

Merge branch 'release/1.10.x'

Browse Source
This commit is contained in:
rdb 2020-11-28 22:26:04 +01:00
commit c9aedc2b44
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
direct/src/showbase/VFSImporter.py
View File

@ -65,7 +65,7 @@ class VFSImporter:
vfile = vfs.getFile(filename, True) vfile = vfs.getFile(filename, True)
if vfile: if vfile:
return VFSLoader(dir_path, vfile, filename, return VFSLoader(dir_path, vfile, filename,
desc=('.py', 'U', imp.PY_SOURCE)) desc=('.py', 'r', imp.PY_SOURCE))
# If there's no .py file, but there's a .pyc file, load that # If there's no .py file, but there's a .pyc file, load that
# anyway. # anyway.
@ -93,7 +93,7 @@ class VFSImporter:
vfile = vfs.getFile(filename, True) vfile = vfs.getFile(filename, True)
if vfile: if vfile:
return VFSLoader(dir_path, vfile, filename, packagePath=path, return VFSLoader(dir_path, vfile, filename, packagePath=path,
desc=('.py', 'U', imp.PY_SOURCE)) desc=('.py', 'r', imp.PY_SOURCE))
for ext in compiledExtensions: for ext in compiledExtensions:
filename = Filename(path, '__init__.' + ext) filename = Filename(path, '__init__.' + ext)
vfile = vfs.getFile(filename, True) vfile = vfs.getFile(filename, True)

4
makepanda/makepackage.py
View File

@ -117,8 +117,8 @@ deps: {DEPENDS}
MACOS_SCRIPT_PREFIX = \ MACOS_SCRIPT_PREFIX = \
"""#!/bin/bash """#!/bin/bash
IFS=. IFS=.
read -a version_info <<< "`sw_vers -productVersion`'" read -a version_info <<< "`sw_vers -productVersion`"
if (( ${version_info[1]} < 15 )); then if (( ${version_info[0]} == 10 && ${version_info[1]} < 15 )); then
""" """
MACOS_SCRIPT_POSTFIX = \ MACOS_SCRIPT_POSTFIX = \

5
makepanda/makepanda.py
View File

@ -272,7 +272,7 @@ def parseopts(args):
try: try:
maj, min = OSXTARGET.strip().split('.') maj, min = OSXTARGET.strip().split('.')
OSXTARGET = int(maj), int(min) OSXTARGET = int(maj), int(min)
assert OSXTARGET[0] == 10 assert OSXTARGET[0] >= 10
except: except:
usage("Invalid setting for OSXTARGET") usage("Invalid setting for OSXTARGET")
@ -2361,9 +2361,6 @@ def WriteConfigSettings():
dtool_config["HAVE_VIDEO4LINUX"] = 'UNDEF' dtool_config["HAVE_VIDEO4LINUX"] = 'UNDEF'
dtool_config["PHAVE_LINUX_INPUT_H"] = 'UNDEF' dtool_config["PHAVE_LINUX_INPUT_H"] = 'UNDEF'
dtool_config["IS_OSX"] = '1' dtool_config["IS_OSX"] = '1'
# 10.4 had a broken ucontext implementation
if int(platform.mac_ver()[0][3]) <= 4:
dtool_config["PHAVE_UCONTEXT_H"] = 'UNDEF'
if PkgSkip("X11"): if PkgSkip("X11"):
dtool_config["HAVE_GLX"] = 'UNDEF' dtool_config["HAVE_GLX"] = 'UNDEF'