Browse Source

"models" directory should also be generated without pandatool

rdb 16 years ago
parent
commit
1c28973cb4
1 changed files with 24 additions and 26 deletions
  1. 24 26
      makepanda/makepanda.py

+ 24 - 26
makepanda/makepanda.py

@@ -4053,32 +4053,30 @@ if (RUNTIME):
 # Generate the models directory and samples directory
 #
 
-if (PkgSkip("PANDATOOL")==0):
-
-    for model in GetDirectoryContents("dmodels/src/misc", ["*.egg", "*.flt"]):
-        eggpz = model[:-4] + ".egg.pz"
-        TargetAdd(GetOutputDir()+"/models/misc/"+eggpz, input="dmodels/src/misc/"+model)
-
-    for model in GetDirectoryContents("dmodels/src/gui", ["*.egg", "*.flt"]):
-        eggpz = model[:-4] + ".egg.pz"
-        TargetAdd(GetOutputDir()+"/models/gui/"+eggpz, input="dmodels/src/gui/"+model)
-
-    for model in GetDirectoryContents("models", ["*.egg", "*.flt"]):
-        eggpz = model[:-4] + ".egg.pz"
-        TargetAdd(GetOutputDir()+"/models/"+eggpz, input="models/"+model)
-
-    CopyAllFiles(GetOutputDir()+"/models/audio/sfx/",  "dmodels/src/audio/sfx/", ".wav")
-    CopyAllFiles(GetOutputDir()+"/models/icons/",      "dmodels/src/icons/",     ".gif")
-    
-    CopyAllFiles(GetOutputDir()+"/models/maps/",       "models/maps/",           ".jpg")
-    CopyAllFiles(GetOutputDir()+"/models/maps/",       "models/maps/",           ".png")
-    CopyAllFiles(GetOutputDir()+"/models/maps/",       "models/maps/",           ".rgb")
-    CopyAllFiles(GetOutputDir()+"/models/maps/",       "models/maps/",           ".rgba")
-    
-    CopyAllFiles(GetOutputDir()+"/models/maps/",       "dmodels/src/maps/",      ".jpg")
-    CopyAllFiles(GetOutputDir()+"/models/maps/",       "dmodels/src/maps/",      ".png")
-    CopyAllFiles(GetOutputDir()+"/models/maps/",       "dmodels/src/maps/",      ".rgb")
-    CopyAllFiles(GetOutputDir()+"/models/maps/",       "dmodels/src/maps/",      ".rgba")
+for model in GetDirectoryContents("dmodels/src/misc", ["*.egg", "*.flt"]):
+    eggpz = model[:-4] + ".egg.pz"
+    TargetAdd(GetOutputDir()+"/models/misc/"+eggpz, input="dmodels/src/misc/"+model)
+
+for model in GetDirectoryContents("dmodels/src/gui", ["*.egg", "*.flt"]):
+    eggpz = model[:-4] + ".egg.pz"
+    TargetAdd(GetOutputDir()+"/models/gui/"+eggpz, input="dmodels/src/gui/"+model)
+
+for model in GetDirectoryContents("models", ["*.egg", "*.flt"]):
+    eggpz = model[:-4] + ".egg.pz"
+    TargetAdd(GetOutputDir()+"/models/"+eggpz, input="models/"+model)
+
+CopyAllFiles(GetOutputDir()+"/models/audio/sfx/",  "dmodels/src/audio/sfx/", ".wav")
+CopyAllFiles(GetOutputDir()+"/models/icons/",      "dmodels/src/icons/",     ".gif")
+
+CopyAllFiles(GetOutputDir()+"/models/maps/",       "models/maps/",           ".jpg")
+CopyAllFiles(GetOutputDir()+"/models/maps/",       "models/maps/",           ".png")
+CopyAllFiles(GetOutputDir()+"/models/maps/",       "models/maps/",           ".rgb")
+CopyAllFiles(GetOutputDir()+"/models/maps/",       "models/maps/",           ".rgba")
+
+CopyAllFiles(GetOutputDir()+"/models/maps/",       "dmodels/src/maps/",      ".jpg")
+CopyAllFiles(GetOutputDir()+"/models/maps/",       "dmodels/src/maps/",      ".png")
+CopyAllFiles(GetOutputDir()+"/models/maps/",       "dmodels/src/maps/",      ".rgb")
+CopyAllFiles(GetOutputDir()+"/models/maps/",       "dmodels/src/maps/",      ".rgba")
 
 ##########################################################################################
 #