Changeset 9823 for code/branches/levelMichael/src/libraries

Timestamp:

Nov 25, 2013, 4:10:21 PM (11 years ago)

Author:

jo

Message:

merging latest trunk into branch 'levelMichael'

Location:

code/branches/levelMichael

Files:

• . (modified) (1 prop)
• src/libraries/core/GUIManager.cc (modified) (1 diff)
• src/libraries/util/CMakeLists.txt (modified) (1 diff)

code/branches/levelMichael/src/libraries/core/GUIManager.cc

@@ -350 +350 @@
             CEGUI::System::getSingleton().setXMLParser("XercesParser");
         }
-        catch (const CEGUI::GenericException& e)
+        catch (const CEGUI::GenericException&)
         {
             // Fall back to default parser

code/branches/levelMichael/src/libraries/util/CMakeLists.txt

@@ -48 +48 @@
     ${CEGUI_LIBRARY}
     ${OGRE_LIBRARY}
+    ${Boost_SYSTEM_LIBRARY}
   SOURCE_FILES
     ${UTIL_SRC_FILES}