Sfoglia il codice sorgente

Experimental.
* Real support for LINK_ALL_STATIC in makepanda
* Split rtdist and plugin build systems
* Build both application bundle and 'panda3d' executable on Mac
* Get 'models' package working well.

rdb 16 anni fa
parent
commit
8882312968
2 ha cambiato i file con 316 aggiunte e 325 eliminazioni
  1. 302 325
      makepanda/makepanda.py
  2. 14 0
      makepanda/makepandacore.py

File diff suppressed because it is too large
+ 302 - 325
makepanda/makepanda.py


+ 14 - 0
makepanda/makepandacore.py

@@ -22,6 +22,7 @@ CUSTOM_OUTPUTDIR=False
 THIRDPARTYDIR=None
 THIRDPARTYDIR=None
 OPTIMIZE="3"
 OPTIMIZE="3"
 VERBOSE=False
 VERBOSE=False
+LINK_ALL_STATIC=False
 
 
 ########################################################################
 ########################################################################
 ##
 ##
@@ -777,6 +778,17 @@ def SetVerbose(verbose):
   global VERBOSE
   global VERBOSE
   VERBOSE=verbose
   VERBOSE=verbose
 
 
+def GetLinkAllStatic():
+  return LINK_ALL_STATIC
+
+def SetLinkAllStatic(val = True):
+  global LINK_ALL_STATIC
+  LINK_ALL_STATIC = val
+
+def UnsetLinkAllStatic():
+  global LINK_ALL_STATIC
+  LINK_ALL_STATIC = False
+
 ########################################################################
 ########################################################################
 ##
 ##
 ## Package Selection
 ## Package Selection
@@ -1598,6 +1610,8 @@ def CalcLocation(fn, ipath):
 
 
 
 
 def FindLocation(fn, ipath):
 def FindLocation(fn, ipath):
+    if (GetLinkAllStatic() and fn.endswith(".dll")):
+        fn = fn[:-4]+".lib"
     loc = CalcLocation(fn, ipath)
     loc = CalcLocation(fn, ipath)
     (base,ext) = os.path.splitext(fn)
     (base,ext) = os.path.splitext(fn)
     ORIG_EXT[loc] = ext
     ORIG_EXT[loc] = ext

Some files were not shown because too many files changed in this diff