Changeset 2512

Timestamp:

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

Author:

rgrieder

Message:

Fixed build due to merge

Location:

code/branches/buildsystem2/src

Files:

• orxonox/gamestates/GSGraphics.cc (modified) (1 diff)
• util/CMakeLists.txt (modified) (1 diff)

code/branches/buildsystem2/src/orxonox/gamestates/GSGraphics.cc

@@ -325 +325 @@
         COUT(4) << "Creating Ogre Root..." << std::endl;
 
-        if (ogrePluginsFile_ == "")
-        {
-            COUT(2) << "Warning: Ogre plugins file set to \"\". Defaulting to plugins.cfg" << std::endl;
-            ModifyConfigValue(ogrePluginsFile_, tset, "plugins.cfg");
-        }
         if (ogreConfigFile_ == "")
         {

code/branches/buildsystem2/src/util/CMakeLists.txt

@@ -16 +16 @@
 TARGET_LINK_LIBRARIES(util ${OGRE_LIBRARY})
 INSTALL(TARGETS util LIBRARY DESTINATION lib)
-
-)
-