From f25f18ed420ea8dd54f5ad7002ab49e2d900e47f Mon Sep 17 00:00:00 2001 From: Yohann Ferreira Date: Sun, 14 Dec 2014 02:55:49 +0100 Subject: [PATCH] Removed the need of @OPENDUNGEONS_MEDIA_DIR@ + misc things. I also added the missing octree debug plugin and remove various useless lines. Part of #367 --- cmake/config/plugins.cfg.in | 1 - cmake/config/plugins_d.cfg.in | 4 +++- cmake/config/resources.cfg.in | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/cmake/config/plugins.cfg.in b/cmake/config/plugins.cfg.in index b1eccea3c..7b5478347 100644 --- a/cmake/config/plugins.cfg.in +++ b/cmake/config/plugins.cfg.in @@ -4,7 +4,6 @@ PluginFolder=@OD_OGRE_PLUGIN_DIR_REL@ # Define plugins -@OD_COMMENT_D3D@ Plugin=RenderSystem_Direct3D9 Plugin=RenderSystem_GL #Plugin=Plugin_ParticleFX diff --git a/cmake/config/plugins_d.cfg.in b/cmake/config/plugins_d.cfg.in index 5cd75fd26..c9591632c 100644 --- a/cmake/config/plugins_d.cfg.in +++ b/cmake/config/plugins_d.cfg.in @@ -4,10 +4,12 @@ PluginFolder=@OD_OGRE_PLUGIN_DIR_DBG@ # Define plugins -@OD_COMMENT_D3D@ Plugin=RenderSystem_Direct3D9_d Plugin=RenderSystem_GL_d #Plugin=Plugin_ParticleFX_d #This is a card specific library, installed on some systems but not on others #Cg is also obsolete and nonfree #Plugin=Plugin_CgProgramManager_d + +#Scene manager +Plugin=Plugin_OctreeSceneManager_d \ No newline at end of file diff --git a/cmake/config/resources.cfg.in b/cmake/config/resources.cfg.in index ca6a1b1bd..2eee24ed8 100644 --- a/cmake/config/resources.cfg.in +++ b/cmake/config/resources.cfg.in @@ -1,18 +1,18 @@ [Graphics] -FileSystem=@OPENDUNGEONS_MEDIA_DIR@/materials/RTShaderLib -FileSystem=@OPENDUNGEONS_MEDIA_DIR@/materials/RTShaderLib/materials -FileSystem=@OPENDUNGEONS_MEDIA_DIR@/materials/RTShaderLib/GLSL -FileSystem=@OPENDUNGEONS_MEDIA_DIR@/materials/RTShaderLib/Cg -FileSystem=@OPENDUNGEONS_MEDIA_DIR@/materials/scripts -FileSystem=@OPENDUNGEONS_MEDIA_DIR@/materials/textures -FileSystem=@OPENDUNGEONS_MEDIA_DIR@/models +FileSystem=materials/RTShaderLib +FileSystem=materials/RTShaderLib/materials +FileSystem=materials/RTShaderLib/GLSL +FileSystem=materials/RTShaderLib/GLSL150 +FileSystem=materials/scripts +FileSystem=materials/textures +FileSystem=models [GUI] -FileSystem=@OPENDUNGEONS_MEDIA_DIR@/gui -FileSystem=@OPENDUNGEONS_MEDIA_DIR@/gui/schemas +FileSystem=gui +FileSystem=gui/schemas [Music] -FileSystem=@OPENDUNGEONS_MEDIA_DIR@/music +FileSystem=music [Sound] -FileSystem=@OPENDUNGEONS_MEDIA_DIR@/sounds +FileSystem=sounds