Skip to content

Commit

Permalink
Removed the need of @OPENDUNGEONS_MEDIA_DIR@ + misc things.
Browse files Browse the repository at this point in the history
I also added the missing octree debug plugin and remove various useless lines.

Part of #367
  • Loading branch information
Yohann Ferreira committed Dec 14, 2014
1 parent 85e649e commit f25f18e
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
1 change: 0 additions & 1 deletion cmake/config/plugins.cfg.in
Expand Up @@ -4,7 +4,6 @@
PluginFolder=@OD_OGRE_PLUGIN_DIR_REL@

# Define plugins
@OD_COMMENT_D3D@ Plugin=RenderSystem_Direct3D9
Plugin=RenderSystem_GL
#Plugin=Plugin_ParticleFX

Expand Down
4 changes: 3 additions & 1 deletion cmake/config/plugins_d.cfg.in
Expand Up @@ -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
22 changes: 11 additions & 11 deletions 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

0 comments on commit f25f18e

Please sign in to comment.