Some fixes for OSX and windows

makepanda/makepanda.py

@@ -13,6 +13,7 @@
 ########################################################################
 
 import sys,os,platform,time,stat,string,re,getopt,fnmatch,threading,Queue,signal,shutil
+from xml.dom.minidom import parse
 
 from makepandacore import *
 from installpanda import *
@@ -3063,7 +3064,7 @@ if (PkgSkip("PLUGIN")==0 and PkgSkip("TINYXML")==0):
     TargetAdd('panda3d.exe', input='dtoolutil_filename_assist.obj')
     TargetAdd('panda3d.exe', input='interrogatedb_composite.obj')
     TargetAdd('panda3d.exe', input='libexpress_igate.obj')
-  TargetAdd('panda3d.exe', opts=['PYTHON', 'TINYXML', 'OPENSSL', 'ZLIB', 'WINGDI', 'WINUSER', 'WINSHELL'])
+  TargetAdd('panda3d.exe', opts=['PYTHON', 'TINYXML', 'OPENSSL', 'ZLIB', 'WINGDI', 'WINUSER', 'WINSHELL', 'ADVAPI'])
 
 #
 # DIRECTORY: pandatool/src/pandatoolbase/

makepanda/makepandacore.py

@@ -1205,18 +1205,19 @@ def CalcLocation(fn, ipath):
         if (fn.endswith(".dat")): return OUTPUTDIR+"/tmp/"+fn
         if (fn.endswith(".in")):  return OUTPUTDIR+"/pandac/input/"+fn
     elif (sys.platform == "darwin"):
-        if (fn.endswith(".mm")):  return CxxFindSource(fn, ipath)
-        if (fn.endswith(".r")):   return CxxFindSource(fn, ipath)
-        if (fn.endswith(".obj")): return OUTPUTDIR+"/tmp/"+fn[:-4]+".o"
-        if (fn.endswith(".dll")): return OUTPUTDIR+"/lib/"+fn[:-4]+".dylib"
-        if (fn.endswith(".pyd")): return OUTPUTDIR+"/lib/"+fn[:-4]+".dylib"
-        if (fn.endswith(".exe")): return OUTPUTDIR+"/bin/"+fn[:-4]
-        if (fn.endswith(".lib")): return OUTPUTDIR+"/lib/"+fn[:-4]+".a"
-        if (fn.endswith(".ilb")): return OUTPUTDIR+"/tmp/"+fn[:-4]+".a"
-        if (fn.endswith(".dat")): return OUTPUTDIR+"/tmp/"+fn
-        if (fn.endswith(".rsrc")):return OUTPUTDIR+"/tmp/"+fn
-        if (fn.endswith(".plugin")): return OUTPUTDIR+"/plugins/"+fn
-        if (fn.endswith(".in")):  return OUTPUTDIR+"/pandac/input/"+fn
+        if (fn.endswith(".mm")):    return CxxFindSource(fn, ipath)
+        if (fn.endswith(".r")):     return CxxFindSource(fn, ipath)
+        if (fn.endswith(".plist")): return CxxFindSource(fn, ipath)
+        if (fn.endswith(".obj")):   return OUTPUTDIR+"/tmp/"+fn[:-4]+".o"
+        if (fn.endswith(".dll")):   return OUTPUTDIR+"/lib/"+fn[:-4]+".dylib"
+        if (fn.endswith(".pyd")):   return OUTPUTDIR+"/lib/"+fn[:-4]+".dylib"
+        if (fn.endswith(".exe")):   return OUTPUTDIR+"/bin/"+fn[:-4]
+        if (fn.endswith(".lib")):   return OUTPUTDIR+"/lib/"+fn[:-4]+".a"
+        if (fn.endswith(".ilb")):   return OUTPUTDIR+"/tmp/"+fn[:-4]+".a"
+        if (fn.endswith(".dat")):   return OUTPUTDIR+"/tmp/"+fn
+        if (fn.endswith(".rsrc")):  return OUTPUTDIR+"/tmp/"+fn
+        if (fn.endswith(".plugin")):return OUTPUTDIR+"/plugins/"+fn
+        if (fn.endswith(".in")):    return OUTPUTDIR+"/pandac/input/"+fn
     else:
         if (fn.endswith(".obj")): return OUTPUTDIR+"/tmp/"+fn[:-4]+".o"
         if (fn.endswith(".dll")): return OUTPUTDIR+"/lib/"+fn[:-4]+".so"