mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-02 09:52:27 -04:00
Include string_escape encoding in panda3d package, pickle seems to rely on it
This commit is contained in:
parent
4dc09928e1
commit
166545a5d6
@ -26,7 +26,7 @@ class panda3d(package):
|
|||||||
# These are files that the Panda3D runtime will explicitly look
|
# These are files that the Panda3D runtime will explicitly look
|
||||||
# for by name in order to get itself bootstrapped.
|
# for by name in order to get itself bootstrapped.
|
||||||
setupPanda3D()
|
setupPanda3D()
|
||||||
|
|
||||||
# These are Python modules that are needed by most Panda3D
|
# These are Python modules that are needed by most Panda3D
|
||||||
# applications. It doesn't matter too much if we miss one or two
|
# applications. It doesn't matter too much if we miss one or two
|
||||||
# here, since any module imported by any of this code will
|
# here, since any module imported by any of this code will
|
||||||
@ -57,7 +57,8 @@ class panda3d(package):
|
|||||||
module('panda3d')
|
module('panda3d')
|
||||||
|
|
||||||
# Include various standard Python encodings. The rest is in morepy.
|
# Include various standard Python encodings. The rest is in morepy.
|
||||||
module('encodings', 'encodings.utf_8', 'encodings.ascii')
|
module('encodings', 'encodings.utf_8', 'encodings.ascii',
|
||||||
|
'encodings.string_escape')
|
||||||
|
|
||||||
# Pick up the shader files that appear in direct/src/filter.
|
# Pick up the shader files that appear in direct/src/filter.
|
||||||
import direct
|
import direct
|
||||||
@ -106,7 +107,7 @@ aux-display tinydisplay
|
|||||||
aux-display pandagl
|
aux-display pandagl
|
||||||
aux-display tinydisplay
|
aux-display tinydisplay
|
||||||
"""
|
"""
|
||||||
|
|
||||||
file('Config.prc', extract = True, text = """
|
file('Config.prc', extract = True, text = """
|
||||||
plugin-path $PANDA3D_ROOT
|
plugin-path $PANDA3D_ROOT
|
||||||
default-model-extension .bam
|
default-model-extension .bam
|
||||||
@ -117,7 +118,7 @@ class morepy(package):
|
|||||||
# Additional Python modules provided by the standard Python
|
# Additional Python modules provided by the standard Python
|
||||||
# library. Include this package to get the full suite of standard
|
# library. Include this package to get the full suite of standard
|
||||||
# Python functionality.
|
# Python functionality.
|
||||||
|
|
||||||
config(display_name = "Python standard library")
|
config(display_name = "Python standard library")
|
||||||
require('panda3d')
|
require('panda3d')
|
||||||
|
|
||||||
@ -196,8 +197,8 @@ class models(package):
|
|||||||
pathname = getModelPath().findFile('cmss12.egg')
|
pathname = getModelPath().findFile('cmss12.egg')
|
||||||
if pathname:
|
if pathname:
|
||||||
dir(pathname.getDirname(), newDir = '')
|
dir(pathname.getDirname(), newDir = '')
|
||||||
|
|
||||||
|
|
||||||
class fmod(package):
|
class fmod(package):
|
||||||
# This package includes the FMod audio library. This is
|
# This package includes the FMod audio library. This is
|
||||||
# full-featured and robust, but it is closed-source and the
|
# full-featured and robust, but it is closed-source and the
|
||||||
@ -232,7 +233,7 @@ class audio(package):
|
|||||||
# This package includes the best audio library for the given
|
# This package includes the best audio library for the given
|
||||||
# platform, assuming a non-commercial application.
|
# platform, assuming a non-commercial application.
|
||||||
require('panda3d')
|
require('panda3d')
|
||||||
|
|
||||||
if platform.startswith('osx'):
|
if platform.startswith('osx'):
|
||||||
require('fmod')
|
require('fmod')
|
||||||
else:
|
else:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user