Changeset 2244 for code/branches/buildsystem/bin

Timestamp:

Nov 21, 2008, 12:36:23 AM (16 years ago)

Author:

rgrieder

Message:

Applied long created patch that removes plugins.cfg and puts the content into orxonox.ini
This also allows to specify the media path for each 'distribution' individually because orxonox.ini has been added to the default files.

Location:

code/branches/buildsystem/bin

Files:

• CMakeLists.txt (modified) (3 diffs)
• linux/orxonox.ini (moved) (moved from code/branches/buildsystem/bin/linux/plugins.cfg) (1 diff)
• mingw/orxonox.ini (moved) (moved from code/branches/buildsystem/bin/mingw/plugins.cfg) (1 diff)
• tardis/orxonox.ini (moved) (moved from code/branches/buildsystem/bin/tardis/plugins.cfg) (1 diff)

code/branches/buildsystem/bin/CMakeLists.txt

@@ -10 +10 @@
   SET(CONFIG_FILES ${CONFIG_FILES}
     linux/run-script
-        tardis/plugins.cfg
+        tardis/orxonox.ini
   )
 
@@ -16 +16 @@
   SET(CONFIG_FILES ${CONFIG_FILES}
     linux/run-script
-        linux/plugins.cfg
+        linux/orxonox.ini
   )
 ENDIF(IS_TARDIS)
@@ -22 +22 @@
 IF(MINGW)
   SET(CONFIG_FILES ${CONFIG_FILES}
-    "mingw/plugins.cfg"
+    "mingw/orxonox.ini"
     "mingw/orxonox.bat"
   )

code/branches/buildsystem/bin/linux/orxonox.ini

@@ -1 @@
-# Defines plugins to load
+[Settings]
+dataPath_ = ../../../media/
 
-# Define plugin folder
-PluginFolder=/usr/lib/OGRE
-
-# Define plugins
-#Plugin=RenderSystem_Direct3D9
-Plugin=RenderSystem_GL
-Plugin=Plugin_ParticleFX
-Plugin=Plugin_CgProgramManager
-#Plugin=Plugin_BSPSceneManager
-#Plugin=Plugin_OctreeSceneManager
-
-
+[GSGraphics]
+ogrePluginsFolder_ = /usr/lib/OGRE
+ogrePlugins_ = RenderSystem_GL, Plugin_ParticleFX, Plugin_CgProgramManager #,Plugin_BSPSceneManager, Plugin_OctreeSceneManager

code/branches/buildsystem/bin/mingw/orxonox.ini

@@ -1 @@
-# Defines plugins to load
+[Settings]
+dataPath_ = ../../../media/
 
-# Define plugin folder
-PluginFolder=..\..\libs\ogre\Samples\Common\bin\Release\
-
-# Define plugins
-Plugin=RenderSystem_Direct3D9
-Plugin=RenderSystem_GL
-Plugin=Plugin_ParticleFX
-Plugin=Plugin_CgProgramManager
-#Plugin=Plugin_BSPSceneManager
-#Plugin=Plugin_OctreeSceneManager
-
+[GSGraphics]
+ogrePluginsFolder_ = ..\..\libs\ogre\Samples\Common\bin\Release\
+ogrePlugins_ = RenderSystem_Direct3D9, RenderSystem_GL, Plugin_ParticleFX, Plugin_CgProgramManager #,Plugin_BSPSceneManager, Plugin_OctreeSceneManager

code/branches/buildsystem/bin/tardis/orxonox.ini

@@ -1 @@
-# Defines plugins to load
+[Settings]
+dataPath_ = ../../../media/
 
-# Define plugin folder
-PluginFolder=/usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/lib/OGRE/
-
-# Define plugins
-#Plugin=RenderSystem_Direct3D9
-Plugin=RenderSystem_GL
-Plugin=Plugin_ParticleFX
-Plugin=Plugin_CgProgramManager
-#Plugin=Plugin_BSPSceneManager
-#Plugin=Plugin_OctreeSceneManager
-
-
+[GSGraphics]
+ogrePluginsFolder_ = /usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/lib/OGRE/
+ogrePlugins_ = RenderSystem_GL, Plugin_ParticleFX, Plugin_CgProgramManager #,Plugin_BSPSceneManager, Plugin_OctreeSceneManager