TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 09:23:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add PlatformSDK's bin dir to $PATH, too

Browse Source
This commit is contained in:
rdb 2010-07-07 18:27:21 +00:00
parent 503760f751
commit da7bdf9f51
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
makepanda/makepanda.py
View File

@ -1723,7 +1723,7 @@ CreatePandaVersionFiles()
# #
########################################################################################## ##########################################################################################
if (PkgSkip("PYTHON")==0): if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
CopyTree(GetOutputDir()+'/direct', 'direct/src') CopyTree(GetOutputDir()+'/direct', 'direct/src')
ConditionalWriteFile(GetOutputDir() + '/direct/__init__.py', "") ConditionalWriteFile(GetOutputDir() + '/direct/__init__.py', "")
if (sys.platform.startswith("win")): if (sys.platform.startswith("win")):
@ -3383,7 +3383,7 @@ if (not RUNTIME and (sys.platform == "win32" or sys.platform == "darwin" or PkgS
# DIRECTORY: direct/src/directbase/ # DIRECTORY: direct/src/directbase/
# #
if (PkgSkip("PYTHON")==0): if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
OPTS=['DIR:direct/src/directbase', 'PYTHON'] OPTS=['DIR:direct/src/directbase', 'PYTHON']
TargetAdd('directbase_directbase.obj', opts=OPTS+['BUILDING:DIRECT'], input='directbase.cxx') TargetAdd('directbase_directbase.obj', opts=OPTS+['BUILDING:DIRECT'], input='directbase.cxx')
@ -3402,7 +3402,7 @@ if (PkgSkip("PYTHON")==0):
# DIRECTORY: direct/src/dcparser/ # DIRECTORY: direct/src/dcparser/
# #
if (PkgSkip("PYTHON")==0): if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
OPTS=['DIR:direct/src/dcparser', 'WITHINPANDA', 'BUILDING:DIRECT', 'BISONPREFIX_dcyy'] OPTS=['DIR:direct/src/dcparser', 'WITHINPANDA', 'BUILDING:DIRECT', 'BISONPREFIX_dcyy']
CreateFile(GetOutputDir()+"/include/dcParser.h") CreateFile(GetOutputDir()+"/include/dcParser.h")
TargetAdd('dcparser_dcParser.obj', opts=OPTS, input='dcParser.yxx') TargetAdd('dcparser_dcParser.obj', opts=OPTS, input='dcParser.yxx')
@ -3420,7 +3420,7 @@ if (PkgSkip("PYTHON")==0):
# DIRECTORY: direct/src/deadrec/ # DIRECTORY: direct/src/deadrec/
# #
if (PkgSkip("PYTHON")==0): if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
OPTS=['DIR:direct/src/deadrec', 'BUILDING:DIRECT'] OPTS=['DIR:direct/src/deadrec', 'BUILDING:DIRECT']
TargetAdd('deadrec_composite.obj', opts=OPTS, input='deadrec_composite.cxx') TargetAdd('deadrec_composite.obj', opts=OPTS, input='deadrec_composite.cxx')
IGATEFILES=GetDirectoryContents('direct/src/deadrec', ["*.h", "*_composite.cxx"]) IGATEFILES=GetDirectoryContents('direct/src/deadrec', ["*.h", "*_composite.cxx"])
@ -3432,7 +3432,7 @@ if (PkgSkip("PYTHON")==0):
# DIRECTORY: direct/src/distributed/ # DIRECTORY: direct/src/distributed/
# #
if (PkgSkip("PYTHON")==0): if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
OPTS=['DIR:direct/src/distributed', 'DIR:direct/src/dcparser', 'WITHINPANDA', 'BUILDING:DIRECT', 'OPENSSL'] OPTS=['DIR:direct/src/distributed', 'DIR:direct/src/dcparser', 'WITHINPANDA', 'BUILDING:DIRECT', 'OPENSSL']
TargetAdd('distributed_config_distributed.obj', opts=OPTS, input='config_distributed.cxx') TargetAdd('distributed_config_distributed.obj', opts=OPTS, input='config_distributed.cxx')
TargetAdd('distributed_cConnectionRepository.obj', opts=OPTS, input='cConnectionRepository.cxx') TargetAdd('distributed_cConnectionRepository.obj', opts=OPTS, input='cConnectionRepository.cxx')
@ -3446,7 +3446,7 @@ if (PkgSkip("PYTHON")==0):
# DIRECTORY: direct/src/interval/ # DIRECTORY: direct/src/interval/
# #
if (PkgSkip("PYTHON")==0): if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
OPTS=['DIR:direct/src/interval', 'BUILDING:DIRECT'] OPTS=['DIR:direct/src/interval', 'BUILDING:DIRECT']
TargetAdd('interval_composite.obj', opts=OPTS, input='interval_composite.cxx') TargetAdd('interval_composite.obj', opts=OPTS, input='interval_composite.cxx')
IGATEFILES=GetDirectoryContents('direct/src/interval', ["*.h", "*_composite.cxx"]) IGATEFILES=GetDirectoryContents('direct/src/interval', ["*.h", "*_composite.cxx"])
@ -3458,7 +3458,7 @@ if (PkgSkip("PYTHON")==0):
# DIRECTORY: direct/src/showbase/ # DIRECTORY: direct/src/showbase/
# #
if (PkgSkip("PYTHON")==0): if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
OPTS=['DIR:direct/src/showbase', 'BUILDING:DIRECT'] OPTS=['DIR:direct/src/showbase', 'BUILDING:DIRECT']
TargetAdd('showbase_showBase.obj', opts=OPTS, input='showBase.cxx') TargetAdd('showbase_showBase.obj', opts=OPTS, input='showBase.cxx')
if (sys.platform == "darwin"): if (sys.platform == "darwin"):
@ -3472,7 +3472,7 @@ if (PkgSkip("PYTHON")==0):
# DIRECTORY: direct/metalibs/direct/ # DIRECTORY: direct/metalibs/direct/
# #
if (PkgSkip("PYTHON")==0): if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
OPTS=['DIR:direct/metalibs/direct', 'BUILDING:DIRECT'] OPTS=['DIR:direct/metalibs/direct', 'BUILDING:DIRECT']
TargetAdd('direct_direct.obj', opts=OPTS, input='direct.cxx') TargetAdd('direct_direct.obj', opts=OPTS, input='direct.cxx')
@ -3510,7 +3510,7 @@ if (PkgSkip("PYTHON")==0):
# DIRECTORY: direct/src/dcparse/ # DIRECTORY: direct/src/dcparse/
# #
if (PkgSkip("PYTHON")==0 and not RTDIST and not RUNTIME): if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0 and not RTDIST and not RUNTIME):
OPTS=['DIR:direct/src/dcparse', 'DIR:direct/src/dcparser', 'WITHINPANDA', 'ADVAPI'] OPTS=['DIR:direct/src/dcparse', 'DIR:direct/src/dcparser', 'WITHINPANDA', 'ADVAPI']
TargetAdd('dcparse_dcparse.obj', opts=OPTS, input='dcparse.cxx') TargetAdd('dcparse_dcparse.obj', opts=OPTS, input='dcparse.cxx')
TargetAdd('p3dcparse.exe', input='dcparse_dcparse.obj') TargetAdd('p3dcparse.exe', input='dcparse_dcparse.obj')
@ -3522,7 +3522,7 @@ if (PkgSkip("PYTHON")==0 and not RTDIST and not RUNTIME):
# DIRECTORY: direct/src/heapq/ # DIRECTORY: direct/src/heapq/
# #
if (PkgSkip("PYTHON")==0): if (PkgSkip("PYTHON")==0 and PkgSkip("DIRECT")==0):
OPTS=['DIR:direct/src/heapq'] OPTS=['DIR:direct/src/heapq']
TargetAdd('heapq_heapq.obj', opts=OPTS, input='heapq.cxx') TargetAdd('heapq_heapq.obj', opts=OPTS, input='heapq.cxx')
TargetAdd('libp3heapq.dll', input='heapq_heapq.obj') TargetAdd('libp3heapq.dll', input='heapq_heapq.obj')

1
makepanda/makepandacore.py
View File

@ -1561,6 +1561,7 @@ def SetupVisualStudioEnviron():
AddToPathEnv("INCLUDE", SDK["VISUALSTUDIO"] + "VC\\include") AddToPathEnv("INCLUDE", SDK["VISUALSTUDIO"] + "VC\\include")
AddToPathEnv("INCLUDE", SDK["VISUALSTUDIO"] + "VC\\atlmfc\\include") AddToPathEnv("INCLUDE", SDK["VISUALSTUDIO"] + "VC\\atlmfc\\include")
AddToPathEnv("LIB", SDK["VISUALSTUDIO"] + "VC\\lib"+suffix) AddToPathEnv("LIB", SDK["VISUALSTUDIO"] + "VC\\lib"+suffix)
AddToPathEnv("PATH", SDK["MSPLATFORM"] + "bin")
AddToPathEnv("INCLUDE", SDK["MSPLATFORM"] + "include") AddToPathEnv("INCLUDE", SDK["MSPLATFORM"] + "include")
AddToPathEnv("INCLUDE", SDK["MSPLATFORM"] + "include\\atl") AddToPathEnv("INCLUDE", SDK["MSPLATFORM"] + "include\\atl")
AddToPathEnv("INCLUDE", SDK["MSPLATFORM"] + "include\\mfc") AddToPathEnv("INCLUDE", SDK["MSPLATFORM"] + "include\\mfc")