TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

makepanda: deploy-stub should be a Python-version-specific target

Browse Source
This commit is contained in:
rdb 2018-12-02 21:39:41 +01:00
parent 2664a24e6a
commit 97946cf95e
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
makepanda/makepanda.py
View File

@ -6647,31 +6647,31 @@ if not PkgSkip("CONTRIB") and not PkgSkip("PYTHON") and not RUNTIME:
# DIRECTORY: pandatool/src/deploy-stub # DIRECTORY: pandatool/src/deploy-stub
# #
if PkgSkip("PYTHON") == 0: if PkgSkip("PYTHON") == 0:
OPTS=['DIR:pandatool/src/deploy-stub', 'BUILDING:DEPLOYSTUB', 'PYTHON'] OPTS=['DIR:pandatool/src/deploy-stub', 'BUILDING:DEPLOYSTUB']
TargetAdd('deploy-stub.obj', opts=OPTS, input='deploy-stub.c') PyTargetAdd('deploy-stub.obj', opts=OPTS, input='deploy-stub.c')
if GetTarget() == 'windows': if GetTarget() == 'windows':
TargetAdd('frozen_dllmain.obj', opts=OPTS, input='frozen_dllmain.c') PyTargetAdd('frozen_dllmain.obj', opts=OPTS, input='frozen_dllmain.c')
if GetTarget() == 'linux' or GetTarget() == 'freebsd': if GetTarget() == 'linux' or GetTarget() == 'freebsd':
# Setup rpath so libs can be found in the same directory as the deployed game # Setup rpath so libs can be found in the same directory as the deployed game
LibName('DEPLOYSTUB', "-Wl,-rpath,\$ORIGIN") LibName('DEPLOYSTUB', "-Wl,-rpath,\$ORIGIN")
LibName('DEPLOYSTUB', "-Wl,-z,origin") LibName('DEPLOYSTUB', "-Wl,-z,origin")
LibName('DEPLOYSTUB', "-rdynamic") LibName('DEPLOYSTUB', "-rdynamic")
TargetAdd('deploy-stub.exe', input='deploy-stub.obj') PyTargetAdd('deploy-stub.exe', input='deploy-stub.obj')
if GetTarget() == 'windows': if GetTarget() == 'windows':
TargetAdd('deploy-stub.exe', input='frozen_dllmain.obj') PyTargetAdd('deploy-stub.exe', input='frozen_dllmain.obj')
TargetAdd('deploy-stub.exe', opts=['WINSHELL', 'PYTHON', 'DEPLOYSTUB', 'NOICON']) PyTargetAdd('deploy-stub.exe', opts=['WINSHELL', 'DEPLOYSTUB', 'NOICON'])
if GetTarget() == 'windows': if GetTarget() == 'windows':
TargetAdd('deploy-stubw.exe', input='deploy-stub.obj') PyTargetAdd('deploy-stubw.exe', input='deploy-stub.obj')
TargetAdd('deploy-stubw.exe', input='frozen_dllmain.obj') PyTargetAdd('deploy-stubw.exe', input='frozen_dllmain.obj')
TargetAdd('deploy-stubw.exe', opts=['SUBSYSTEM:WINDOWS', 'WINSHELL', 'PYTHON', 'DEPLOYSTUB', 'NOICON']) PyTargetAdd('deploy-stubw.exe', opts=['SUBSYSTEM:WINDOWS', 'WINSHELL', 'DEPLOYSTUB', 'NOICON'])
elif GetTarget() == 'darwin': elif GetTarget() == 'darwin':
DefSymbol('MACOS_APP_BUNDLE', 'MACOS_APP_BUNDLE') DefSymbol('MACOS_APP_BUNDLE', 'MACOS_APP_BUNDLE')
OPTS = OPTS + ['MACOS_APP_BUNDLE'] OPTS = OPTS + ['MACOS_APP_BUNDLE']
TargetAdd('deploy-stubw.obj', opts=OPTS, input='deploy-stub.c') PyTargetAdd('deploy-stubw.obj', opts=OPTS, input='deploy-stub.c')
TargetAdd('deploy-stubw.exe', input='deploy-stubw.obj') PyTargetAdd('deploy-stubw.exe', input='deploy-stubw.obj')
TargetAdd('deploy-stubw.exe', opts=['MACOS_APP_BUNDLE', 'PYTHON', 'DEPLOYSTUB', 'NOICON']) PyTargetAdd('deploy-stubw.exe', opts=['MACOS_APP_BUNDLE', 'DEPLOYSTUB', 'NOICON'])
# #
# Generate the models directory and samples directory # Generate the models directory and samples directory