Browse Source

Support prebuilt p3d files. Also, let's disable the new library system for the rtdist build until we have pythonwrapper<>c++lib separation working well.

rdb 16 years ago
parent
commit
e0bc983296
1 changed files with 8 additions and 1 deletions
  1. 8 1
      makepanda/makepanda.py

+ 8 - 1
makepanda/makepanda.py

@@ -1084,7 +1084,7 @@ def CompileAnything(target, inputs, opts, progress = None):
             ProgressOutput(progress, "Linking dynamic library", target)
         
         # Add version number to the dynamic library, on unix
-        if (origsuffix==".dll" and not sys.platform.startswith("win")):
+        if (origsuffix==".dll" and not sys.platform.startswith("win") and not RTDIST):
             if (sys.platform == "darwin"):
                 if (target.lower().endswith(".dylib")):
                     target = target[:-5] + VERSION + ".dylib"
@@ -1660,6 +1660,13 @@ if (PkgSkip("PYTHON")==0 and os.path.isdir("thirdparty/Pmw")):
     CopyTree(GetOutputDir()+'/Pmw',         'thirdparty/Pmw')
 ConditionalWriteFile(GetOutputDir()+'/include/ctl3d.h', '/* dummy file to make MAX happy */')
 
+# Copy prebuilt p3d files
+for g in glob.glob("direct/src/p3d/*.p3d"):
+    base = os.path.basename(g)
+    if (sys.platform.startswith("win")):
+        base = base.split(".", 1)[0]
+    CopyFile(GetOutputDir()+"/bin/"+base, g)
+
 ########################################################################
 #
 # Copy header files to the built/include/parser-inc directory.