From 40e3974cc241dd5ea62b0f2c25aa6812cace5748 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 20 Jul 2009 13:34:41 +0000 Subject: [PATCH] stuff --- makepanda/makepanda.py | 7 ++++--- makepanda/makepandacore.py | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index ce8c94d835..4f546bd199 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -2869,7 +2869,7 @@ if (PkgSkip("PLUGIN")==0 and PkgSkip("TINYXML")==0): OPTS=['DIR:direct/src/plugin', 'TINYXML', 'OPENSSL'] TargetAdd('plugin_common.obj', opts=OPTS, input='plugin_common_composite1.cxx') - OPTS=['DIR:direct/src/plugin', 'TINYXML', 'ZLIB', 'JPEG'] + OPTS=['DIR:direct/src/plugin', 'TINYXML', 'ZLIB', 'JPEG', 'OPENSSL'] TargetAdd('plugin_plugin.obj', opts=OPTS, input='p3d_plugin_composite1.cxx') TargetAdd('plugin_mkdir_complete.obj', opts=OPTS, input='mkdir_complete.cxx') TargetAdd('plugin_find_root_dir.obj', opts=OPTS, input='find_root_dir.cxx') @@ -3865,7 +3865,8 @@ except: # ########################################################################################## -RUNTIME_OMIT = ["libp3mayaloader*.*", "libp3ptloader.*", "libpandaskel.*", "libpanda*stripped.*", "lib*fmod*.*", "libpandaegg.*"] +RUNTIME_OMIT = ["libp3mayaloader*.*", "libp3ptloader.*", "libpandaskel.*", "libpanda*stripped.*", + "lib*fmod*.*", "libpandaegg.*", "codec_*.*", "output_*.*", "dsp_*.*"] def MakeRuntime(): # Delete the current. @@ -3892,7 +3893,7 @@ def MakeRuntime(): CopyFile(GetOutputDir()+"/rlib/"+os.path.basename(plugfile), plugfile) if (sys.platform.startswith("win")): for base in os.listdir(GetOutputDir()+"/bin"): - if (base.startswith("lib") and base.endswith(".dll")): + if (base.endswith(".dll")): omit = False for romit in RUNTIME_OMIT: if fnmatch.fnmatch(base, romit): diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index c5c4ba9fc2..b2d0116e69 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -580,7 +580,6 @@ def MakeBuildTree(): MakeDirectory(OUTPUTDIR+"/tmp") MakeDirectory(OUTPUTDIR+"/etc") MakeDirectory(OUTPUTDIR+"/plugins") - MakeDirectory(OUTPUTDIR+"/modelcache") MakeDirectory(OUTPUTDIR+"/include") MakeDirectory(OUTPUTDIR+"/include/openssl") MakeDirectory(OUTPUTDIR+"/models")