Changeset 2510 for code/branches/buildsystem2/bin

Timestamp:

Dec 17, 2008, 9:05:10 PM (16 years ago)

Author:

rgrieder

Message:

Merged revisions 2279-2401 of the buildsystem branch to buildsystem2.

Location:

code/branches/buildsystem2

Files:

• . (modified) (1 prop)
• bin/CMakeLists.txt (modified) (2 diffs)
• bin/linux/orxonox.ini (modified) (1 diff, 1 prop)
• bin/linux/run-script (modified) (1 prop)
• bin/mingw/orxonox.bat (modified) (1 prop)
• bin/mingw/orxonox.ini (modified) (1 prop)
• bin/tardis/ogre.cfg (copied) (copied from code/branches/buildsystem/bin/tardis/ogre.cfg)
• bin/tardis/orxonox.ini (modified) (1 prop)

code/branches/buildsystem2/bin/CMakeLists.txt

@@ -8 +8 @@
 
 IF(IS_TARDIS)
+  # OGRE can't find fonts to display config screen on Tardis,
+  # so providing default config file here.
   SET(CONFIG_FILES ${CONFIG_FILES}
     linux/run-script
-        tardis/orxonox.ini
+    tardis/orxonox.ini
+    tardis/ogre.cfg
   )
 
@@ -16 +19 @@
   SET(CONFIG_FILES ${CONFIG_FILES}
     linux/run-script
-        linux/orxonox.ini
+    linux/orxonox.ini
   )
 ENDIF(IS_TARDIS)

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

@@ -4 +4 @@
 [GSGraphics]
 ogrePluginsFolder_ = /usr/lib/OGRE
-ogrePlugins_ = RenderSystem_GL, Plugin_ParticleFX, Plugin_CgProgramManager #,Plugin_BSPSceneManager, Plugin_OctreeSceneManager
+ogrePlugins_ = RenderSystem_GL, Plugin_ParticleFX #, Plugin_CgProgramManager, Plugin_BSPSceneManager, Plugin_OctreeSceneManager