RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor bugfixes

This commit is contained in:
David Rose 2010-03-19 22:36:27 +00:00
parent 9be238b149
commit 599e8eff89
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -584,7 +584,7 @@ class AppRunner(DirectObject):
else:
# If it's an unknown package, just delete it directly.
print "Deleting unknown package %s" % (packageData.pathname)
self.rmtree(packageData.pathname())
self.rmtree(packageData.pathname)
packages = self.deletePackages(packages)
if packages:

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

@ -74,7 +74,7 @@ class HostInfo:
""" Assigns self.hostUrl, and related values. """
self.hostUrl = hostUrl
if self.hostUrl is None:
if not self.hostUrl:
# A special case: the URL will be set later.
self.hostUrlPrefix = None
self.downloadUrlPrefix = None

6
direct/src/plugin/Sources.pp
View File

@ -220,7 +220,7 @@
// to invoke a particular instance of Panda.
//
#define BUILD_TARGET $[and $[PANDA_PACKAGE_HOST_URL],$[HAVE_TINYXML],$[HAVE_PYTHON],$[HAVE_OPENSSL]]
#define BUILD_TARGET $[and $[HAVE_TINYXML],$[HAVE_PYTHON],$[HAVE_OPENSSL]]
#define USE_PACKAGES tinyxml python openssl cg
#define TARGET p3dpython
@ -268,7 +268,7 @@
// the desktop.)
//
#define BUILD_TARGET $[and $[PANDA_PACKAGE_HOST_URL],$[HAVE_TINYXML],$[HAVE_PYTHON],$[HAVE_OPENSSL],$[WINDOWS_PLATFORM]]
#define BUILD_TARGET $[and $[HAVE_TINYXML],$[HAVE_PYTHON],$[HAVE_OPENSSL],$[WINDOWS_PLATFORM]]
#define USE_PACKAGES tinyxml python openssl
#define TARGET p3dpythonw
#define EXTRA_CDEFS NON_CONSOLE
@ -314,7 +314,7 @@
// desparation fallback in case forking fails for some reason.
//
#define BUILD_TARGET $[and $[PANDA_PACKAGE_HOST_URL],$[HAVE_TINYXML],$[HAVE_PYTHON],$[HAVE_OPENSSL]]
#define BUILD_TARGET $[and $[HAVE_TINYXML],$[HAVE_PYTHON],$[HAVE_OPENSSL]]
#define USE_PACKAGES tinyxml python openssl cg
#define TARGET libp3dpython
#define LIB_PREFIX