From 7ea3dfbfee4139ab4dc9168bb6d875a59d15e2a0 Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 16 Apr 2010 10:16:35 +0000 Subject: [PATCH] Fix model-cache location. On OSX it was even in ~/Documents/Library/Caches/, wow. Thanks go to Bradamante for pointing out the issue. --- makepanda/config.in | 2 +- makepanda/makepanda.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/makepanda/config.in b/makepanda/config.in index d6e03dab54..98f986dffc 100755 --- a/makepanda/config.in +++ b/makepanda/config.in @@ -87,7 +87,7 @@ hardware-animated-vertices #f # Enable the model-cache, but only for models, not textures. -model-cache-dir $USER_APPDATA/.panda3d/cache +model-cache-dir $HOME/.panda3d/cache model-cache-textures #f # This option specifies the default profiles for Cg shaders. diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 1794cd18a9..01486dc90c 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -1705,16 +1705,16 @@ else: configprc=ReadFile("makepanda/config.in") if (sys.platform.startswith("win")): - configprc = configprc.replace(".panda3d","Panda3D-%s" % VERSION) + configprc = configprc.replace("$HOME/.panda3d", "$USER_APPDATA/Panda3D-%s" % MAJOR_VERSION) else: - configprc = configprc.replace("aux-display pandadx9","") - configprc = configprc.replace("aux-display pandadx8","") + configprc = configprc.replace("aux-display pandadx9", "") + configprc = configprc.replace("aux-display pandadx8", "") if (sys.platform == "darwin"): - configprc = configprc.replace(".panda3d","Library/Caches/Panda3D-%s" % VERSION) + configprc = configprc.replace(".panda3d/cache", "Library/Caches/Panda3D-%s" % MAJOR_VERSION) # OpenAL is not yet working well on OSX for us, so let's do this for now. - configprc = configprc.replace("p3openal_audio","p3fmod_audio") + configprc = configprc.replace("p3openal_audio", "p3fmod_audio") ConditionalWriteFile(GetOutputDir()+"/etc/Config.prc", configprc) ConditionalWriteFile(GetOutputDir()+"/etc/Confauto.prc", confautoprc)