Browse Source

Add back missing libp3pystub.a to Mac OS X SDK

rdb 9 years ago
parent
commit
645d179227
2 changed files with 4 additions and 1 deletions
  1. 1 0
      doc/ReleaseNotes
  2. 3 1
      makepanda/makepanda.py

+ 1 - 0
doc/ReleaseNotes

@@ -28,6 +28,7 @@ This issue fixes several bugs that were still found in 1.9.2.
 * Fix occasional frame lag when loading a big model asynchronously
 * Fix occasional frame lag when loading a big model asynchronously
 * Fix race condition reading string config var
 * Fix race condition reading string config var
 * Fix interrogate parsing issue with "const static"
 * Fix interrogate parsing issue with "const static"
+* Add back missing libp3pystub.a to Mac OS X SDK
 
 
 ------------------------  RELEASE 1.9.2  ------------------------
 ------------------------  RELEASE 1.9.2  ------------------------
 
 

+ 3 - 1
makepanda/makepanda.py

@@ -6826,8 +6826,10 @@ def MakeInstallerOSX():
         oscmd("cp -R %s/lib/libp3fmod_audio.* dstroot/fmodex/Developer/Panda3D/lib/" % GetOutputDir())
         oscmd("cp -R %s/lib/libp3fmod_audio.* dstroot/fmodex/Developer/Panda3D/lib/" % GetOutputDir())
         oscmd("cp -R %s/lib/libfmodex* dstroot/fmodex/Developer/Panda3D/lib/" % GetOutputDir())
         oscmd("cp -R %s/lib/libfmodex* dstroot/fmodex/Developer/Panda3D/lib/" % GetOutputDir())
 
 
-    oscmd("mkdir -p dstroot/headers/Developer/Panda3D")
+    oscmd("mkdir -p dstroot/headers/Developer/Panda3D/lib")
     oscmd("cp -R %s/include               dstroot/headers/Developer/Panda3D/include" % GetOutputDir())
     oscmd("cp -R %s/include               dstroot/headers/Developer/Panda3D/include" % GetOutputDir())
+    if os.path.isfile(GetOutputDir() + "/lib/libp3pystub.a"):
+        oscmd("cp -R -P %s/lib/libp3pystub.a dstroot/headers/Developer/Panda3D/lib/" % GetOutputDir())
 
 
     if os.path.isdir("samples"):
     if os.path.isdir("samples"):
         oscmd("mkdir -p dstroot/samples/Developer/Examples/Panda3D")
         oscmd("mkdir -p dstroot/samples/Developer/Examples/Panda3D")