From cdf2dc94efb4e6df27ddbc86e0b2c9b4c4410a4c Mon Sep 17 00:00:00 2001 From: Josh Yelon Date: Mon, 4 Apr 2005 01:52:06 +0000 Subject: [PATCH] Rearranged models --- doc/makepanda/makepanda.py | 33 ++++++++++++++++----------------- doc/makepanda/maketarball.py | 3 --- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/doc/makepanda/makepanda.py b/doc/makepanda/makepanda.py index 06be41a187..a5f8484d3a 100755 --- a/doc/makepanda/makepanda.py +++ b/doc/makepanda/makepanda.py @@ -6138,29 +6138,28 @@ CompileLink(opts=['ADVAPI', 'NSPR', 'FFTW'], dll='stitch-image.exe', obj=[ # ########################################################################################## -MakeDirectory(PREFIX+"/audio") -MakeDirectory(PREFIX+"/audio/sfx") -MakeDirectory(PREFIX+"/icons") -MakeDirectory(PREFIX+"/maps") -MakeDirectory(PREFIX+"/models") +MakeDirectory(PREFIX+"/models/audio") +MakeDirectory(PREFIX+"/models/audio/sfx") +MakeDirectory(PREFIX+"/models/icons") +MakeDirectory(PREFIX+"/models/maps") MakeDirectory(PREFIX+"/models/misc") MakeDirectory(PREFIX+"/models/gui") -CopyAllFiles(PREFIX+"/audio/sfx/", "dmodels/src/audio/sfx/", ".wav") -CopyAllFiles(PREFIX+"/icons/", "dmodels/src/icons/", ".gif") +CopyAllFiles(PREFIX+"/models/audio/sfx/", "dmodels/src/audio/sfx/", ".wav") +CopyAllFiles(PREFIX+"/models/icons/", "dmodels/src/icons/", ".gif") -CopyAllFiles(PREFIX+"/models/", "models/", ".egg") -CopyAllFiles(PREFIX+"/models/", "models/", ".bam") +CopyAllFiles(PREFIX+"/models/", "models/", ".egg") +CopyAllFiles(PREFIX+"/models/", "models/", ".bam") -CopyAllFiles(PREFIX+"/maps/", "models/maps/", ".jpg") -CopyAllFiles(PREFIX+"/maps/", "models/maps/", ".png") -CopyAllFiles(PREFIX+"/maps/", "models/maps/", ".rgb") -CopyAllFiles(PREFIX+"/maps/", "models/maps/", ".rgba") +CopyAllFiles(PREFIX+"/models/maps/", "models/maps/", ".jpg") +CopyAllFiles(PREFIX+"/models/maps/", "models/maps/", ".png") +CopyAllFiles(PREFIX+"/models/maps/", "models/maps/", ".rgb") +CopyAllFiles(PREFIX+"/models/maps/", "models/maps/", ".rgba") -CopyAllFiles(PREFIX+"/maps/", "dmodels/src/maps/", ".jpg") -CopyAllFiles(PREFIX+"/maps/", "dmodels/src/maps/", ".png") -CopyAllFiles(PREFIX+"/maps/", "dmodels/src/maps/", ".rgb") -CopyAllFiles(PREFIX+"/maps/", "dmodels/src/maps/", ".rgba") +CopyAllFiles(PREFIX+"/models/maps/", "dmodels/src/maps/", ".jpg") +CopyAllFiles(PREFIX+"/models/maps/", "dmodels/src/maps/", ".png") +CopyAllFiles(PREFIX+"/models/maps/", "dmodels/src/maps/", ".rgb") +CopyAllFiles(PREFIX+"/models/maps/", "dmodels/src/maps/", ".rgba") CompileBAM("../=", PREFIX+"/models/gui/dialog_box_gui.bam", "dmodels/src/gui/dialog_box_gui.flt") diff --git a/doc/makepanda/maketarball.py b/doc/makepanda/maketarball.py index 70c015cec8..c546438d58 100755 --- a/doc/makepanda/maketarball.py +++ b/doc/makepanda/maketarball.py @@ -142,9 +142,6 @@ cp --recursive built/Pmw $RPM_BUILD_ROOT/usr/share/panda3d/Pmw cp built/direct/__init__.py $RPM_BUILD_ROOT/usr/share/panda3d/direct/__init__.py cp --recursive SceneEditor $RPM_BUILD_ROOT/usr/share/panda3d/SceneEditor cp --recursive built/models $RPM_BUILD_ROOT/usr/share/panda3d/models -cp --recursive built/icons $RPM_BUILD_ROOT/usr/share/panda3d/icons -cp --recursive built/audio $RPM_BUILD_ROOT/usr/share/panda3d/audio -cp --recursive built/maps $RPM_BUILD_ROOT/usr/share/panda3d/maps cp --recursive samples $RPM_BUILD_ROOT/usr/share/panda3d/samples cp --recursive built/lib $RPM_BUILD_ROOT/usr/lib/panda3d cp doc/LICENSE $RPM_BUILD_ROOT/usr/lib/panda3d/LICENSE