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

Merge branch 'release/1.10.x'

Browse Source
This commit is contained in:
rdb 2020-12-22 00:37:50 +01:00
commit f4fa444013
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
makepanda/makepackage.py
View File

@ -388,7 +388,8 @@ def MakeInstallerOSX(version, python_versions=[], installdir=None, **kwargs):
oscmd("cp -R %s/models dstroot/base/%s/models" % (outputdir, installdir))
oscmd("cp -R doc/LICENSE dstroot/base/%s/LICENSE" % installdir)
oscmd("cp -R doc/ReleaseNotes dstroot/base/%s/ReleaseNotes" % installdir)
oscmd("cp -R %s/Frameworks dstroot/base/%s/Frameworks" % (outputdir, installdir))
if os.path.isdir(outputdir+"/Frameworks") and os.listdir(outputdir+"/Frameworks"):
oscmd("cp -R %s/Frameworks dstroot/base/%s/Frameworks" % (outputdir, installdir))
if os.path.isdir(outputdir+"/plugins"):
oscmd("cp -R %s/plugins dstroot/base/%s/plugins" % (outputdir, installdir))

1
makepanda/makepanda.py
View File

@ -2911,6 +2911,7 @@ if tp_dir is not None:
JustBuilt([target], [tp_lib])
for fwx in glob.glob(tp_pkg + "/*.framework"):
MakeDirectory(GetOutputDir() + "/Frameworks")
CopyTree(GetOutputDir() + "/Frameworks/" + os.path.basename(fwx), fwx)
else: # Linux / FreeBSD case.

5
makepanda/makepandacore.py
View File

@ -1237,10 +1237,7 @@ def MakeBuildTree():
MakeDirectory(OUTPUTDIR + "/pandac/input")
MakeDirectory(OUTPUTDIR + "/panda3d")
if GetTarget() == 'darwin':
MakeDirectory(OUTPUTDIR + "/Frameworks")
elif GetTarget() == 'android':
if GetTarget() == 'android':
MakeDirectory(OUTPUTDIR + "/classes")
########################################################################