Properer fix

This commit is contained in:
rdb 2010-11-10 19:49:42 +00:00
parent 8d91eff110
commit b6d88741c3

View File

@ -174,7 +174,6 @@ def parseopts(args):
usage("Options --runtime and --rtdist cannot be specified at the same time!")
if (optimize=="" and (RTDIST or RUNTIME)): optimize = "4"
elif (optimize==""): optimize = "3"
if (DEBVERSION is None): DEBVERSION = VERSION
if (OSXTARGET != None and OSXTARGET.strip() == ""):
OSXTARGET = None
elif (OSXTARGET != None):
@ -218,16 +217,19 @@ if (sys.platform == "darwin" and OSXTARGET != None):
##
########################################################################
if (VERSION == None):
if (VERSION is None):
if (RUNTIME):
VERSION = ParsePluginVersion("dtool/PandaVersion.pp")
COREAPI_VERSION = VERSION + "." + ParseCoreapiVersion("dtool/PandaVersion.pp")
else:
VERSION = ParsePandaVersion("dtool/PandaVersion.pp")
if (COREAPI_VERSION == None):
if (COREAPI_VERSION is None):
COREAPI_VERSION = VERSION
if (DEBVERSION is None):
DEBVERSION = VERSION
MAJOR_VERSION = VERSION[:3]
if (RUNTIME or RTDIST):