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

deploy-ng: Linux: fix symbol error with static linking, fix omission of libCg

Browse Source
This commit is contained in:
rdb 2017-02-03 12:25:58 +01:00
parent c0f0749c21
commit 9b07578d62
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/showutil/dist.py
View File

@ -26,6 +26,8 @@ def find_packages(whlfile):
return [ return [
i for i in filelist i for i in filelist
if '.so.' in i or if '.so.' in i or
#TODO: find a better way to exclude deploy_libs from this.
(i.endswith('.so') and not i.startswith('deploy_libs/')) or
i.endswith('.dll') or i.endswith('.dll') or
i.endswith('.dylib') or i.endswith('.dylib') or
'libpandagl' in i or 'libpandagl' in i or

1
makepanda/makepanda.py
View File

@ -6394,6 +6394,7 @@ if PkgSkip("PYTHON") == 0:
# 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")
TargetAdd('deploy-stub.exe', input='deploy-stub.obj') TargetAdd('deploy-stub.exe', input='deploy-stub.obj')
if GetTarget() == 'windows': if GetTarget() == 'windows':
TargetAdd('deploy-stub.exe', input='frozen_dllmain.obj') TargetAdd('deploy-stub.exe', input='frozen_dllmain.obj')