Changeset 1270 for code/branches/merge

Timestamp:

May 14, 2008, 11:24:31 AM (17 years ago)

Author:

rgrieder

Message:

• little change with ogre logManager. Maybe that works now on Oli's box.

Location:

code/branches/merge

Files:

• src/orxonox/GraphicsEngine.cc (modified) (1 diff)
• visual_studio/network_properties.vsprops (modified) (1 diff)
• visual_studio/orxonox_properties.vsprops (modified) (1 diff)

code/branches/merge/src/orxonox/GraphicsEngine.cc

@@ -138 +138 @@
 
     // create a logManager
-    Ogre::LogManager *logger;
-    //if (Ogre::LogManager::getSingletonPtr() == 0)
     // note: If there's already a logManager, Ogre will complain by a failed assertation.
     // but that shouldn't happen, since this is the first time to create a logManager..
-    logger = new Ogre::LogManager();
-    //else
-    //  logger = Ogre::LogManager::getSingletonPtr();
-    CCOUT(4) << "Ogre LogManager created/assigned" << std::endl;
+    Ogre::LogManager* logger = new Ogre::LogManager();
+    CCOUT(4) << "Ogre LogManager created" << std::endl;
 
     // create our own log that we can listen to

code/branches/merge/visual_studio/network_properties.vsprops

@@ -8 +8 @@
         <Tool
                 Name="VCCLCompilerTool"
-                PreprocessorDefinitions="NETWORK_STATIC_BUILD;WIN32_LEAN_AND_MEAN"
+                PreprocessorDefinitions="ORXONOX_NO_EXPORTS;NETWORK_STATIC_BUILD;WIN32_LEAN_AND_MEAN"
         />
         <Tool

code/branches/merge/visual_studio/orxonox_properties.vsprops

@@ -8 +8 @@
         <Tool
                 Name="VCCLCompilerTool"
-                PreprocessorDefinitions="ORXONOX_SHARED_BUILD;NETWORK_STATIC_BUILD"
+                PreprocessorDefinitions="ORXONOX_NO_EXPORTS;NETWORK_STATIC_BUILD"
                 UsePrecompiledHeader="2"
                 PrecompiledHeaderThrough="OrxonoxStableHeaders.h"