TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Oops, fix build

Browse Source
This commit is contained in:
rdb 2015-01-12 20:35:17 +01:00
parent 0aa0f34c74
commit d6ce7c6562
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/p3d/Packager.py
View File

@ -3634,7 +3634,7 @@ class Packager:
for subfile in dirList:
filename = subfile.getFilename()
if filename.getBasename() == '__init__.py':
moduleName = newName.replace("/", ".").rsplit('.', 1)[0]
moduleName = newName.replace("/", ".")
self.addModule([moduleName], filename=filename)
for subfile in dirList:

2
direct/src/p3d/panda3d.pdef
View File

@ -373,7 +373,7 @@ class vrpn(package):
config(display_name = "Panda3D VRPN support")
require('panda3d')
module('panda3d.vrpn')
module('panda3d.vrpn', required = True)
file('libp3vrpn.dll', required = True)

5
makepanda/makepanda.py
View File

@ -2206,7 +2206,8 @@ def WriteConfigSettings():
if (RTDIST or RUNTIME):
prc_parameters["DEFAULT_PRC_DIR"] = '""'
plugin_config["PANDA_PACKAGE_HOST_URL"] = HOST_URL
if HOST_URL:
plugin_config["PANDA_PACKAGE_HOST_URL"] = HOST_URL
#plugin_config["P3D_PLUGIN_LOG_DIRECTORY"] = ""
plugin_config["P3D_PLUGIN_LOG_BASENAME1"] = ""
plugin_config["P3D_PLUGIN_LOG_BASENAME2"] = ""
@ -2416,7 +2417,7 @@ def CreatePandaVersionFiles():
pandaversion_h = pandaversion_h.replace("$DISTRIBUTOR",DISTRIBUTOR)
pandaversion_h = pandaversion_h.replace("$RTDIST_VERSION",RTDIST_VERSION)
pandaversion_h = pandaversion_h.replace("$COREAPI_VERSION",COREAPI_VERSION)
pandaversion_h = pandaversion_h.replace("$HOST_URL",HOST_URL)
pandaversion_h = pandaversion_h.replace("$HOST_URL",(HOST_URL or ""))
if (DISTRIBUTOR == "cmu"):
pandaversion_h += "\n#define PANDA_OFFICIAL_VERSION\n"
else: