File stuntrally-ogre.patch of Package stuntrally

Overview Repositories Revisions Requests Users Attributes Meta

File stuntrally-ogre.patch of Package stuntrally

Index: stuntrally/CMakeLists.txt
===================================================================
--- stuntrally.orig/CMakeLists.txt
+++ stuntrally/CMakeLists.txt
@@ -92,13 +92,13 @@ if(BUILD_GAME OR BUILD_EDITOR)
         add_definitions(-DOGRE_PLUGIN_DIR_DBG="${OGRE_PLUGIN_DIR}")
     else()
         find_package(OGRE REQUIRED QUIET)
-        include_directories(${OGRE_INCLUDE_DIRS} ${OGRE_Terrain_INCLUDE_DIRS} ${OGRE_Paging_INCLUDE_DIRS})
+        include_directories(${OGRE_INCLUDE_DIRS} ${OGRE_Terrain_INCLUDE_DIRS} ${OGRE_Paging_INCLUDE_DIRS} ${OGRE_Overlay_INCLUDE_DIRS} ${OGRE_Bites_INCLUDE_DIRS})
         # Overlay moved to separate component in 1.9
         if (OGRE_VERSION_MAJOR GREATER 1 OR OGRE_VERSION_MINOR GREATER 8)
             include_directories(${OGRE_Overlay_INCLUDE_DIRS})
         endif()
         link_directories(${OGRE_LIBRARY_DIRS})
-        list(APPEND LIBS ${OGRE_LIBRARIES} ${OGRE_Terrain_LIBRARIES} ${OGRE_Paging_LIBRARIES})
+        list(APPEND LIBS ${OGRE_LIBRARIES} ${OGRE_Terrain_LIBRARIES} ${OGRE_Paging_LIBRARIES} ${OGRE_Overlay_LIBRARIES} ${OGRE_Bites_LIBRARIES})
         # Overlay moved to separate component in 1.9
         if (OGRE_VERSION_MAJOR GREATER 1 OR OGRE_VERSION_MINOR GREATER 8)
             list(APPEND LIBS ${OGRE_Overlay_LIBRARIES})
Index: stuntrally/cmake/FindOGRE.cmake
===================================================================
--- stuntrally.orig/cmake/FindOGRE.cmake
+++ stuntrally/cmake/FindOGRE.cmake
@@ -399,6 +399,8 @@ macro(ogre_find_component COMPONENT HEAD
   endif()
 endmacro()
 
+# look for Bites component
+ogre_find_component(Bites OgreWindowEventUtilities.h)
 # look for Paging component
 ogre_find_component(Paging OgrePaging.h)
 # look for Terrain component
@@ -412,6 +414,7 @@ ogre_find_component(Volume OgreVolumePre
 # look for Overlay component
 ogre_find_component(Overlay OgreOverlaySystem.h)
 
+
 #########################################################
 # Find Ogre plugins
 #########################################################        
Index: stuntrally/source/ogre/BaseApp.cpp
===================================================================
--- stuntrally.orig/source/ogre/BaseApp.cpp
+++ stuntrally/source/ogre/BaseApp.cpp
@@ -10,6 +10,11 @@
 
 #include <MyGUI.h>
 #include <MyGUI_OgrePlatform.h>
+#include <OgreCompositionTargetPass.h>
+#include <OgreCompositorChain.h>
+#include <OgreCompositorManager.h>
+#include <OgreMeshManager.h>
+#include <OgreTextureManager.h>
 using namespace Ogre;
 
 #include "../sdl4ogre/sdlinputwrapper.hpp"
Index: stuntrally/source/ogre/BaseApp_Create.cpp
===================================================================
--- stuntrally.orig/source/ogre/BaseApp_Create.cpp
+++ stuntrally/source/ogre/BaseApp_Create.cpp
@@ -31,6 +31,14 @@
 #include <OgreTimer.h>
 #include "Compositor.h"
 
+#include <OgreCompositorManager.h>
+#include <OgreConfigFile.h>
+#include <OgreHighLevelGpuProgramManager.h>
+#include <OgreRoot.h>
+#include <OgreSceneManager.h>
+#include <OgreTextureManager.h>
+#include <OgreViewport.h>
+
 #include "../shiny/Main/Factory.hpp"
 #include "../shiny/Platforms/Ogre/OgrePlatform.hpp"
 
Index: stuntrally/source/editor/BaseApp_Create.cpp
===================================================================
--- stuntrally.orig/source/editor/BaseApp_Create.cpp
+++ stuntrally/source/editor/BaseApp_Create.cpp
@@ -28,6 +28,11 @@
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_TextBox.h>
 #include <OgreWindowEventUtilities.h>
+#include <OgreCamera.h>
+#include <OgreHighLevelGpuProgramManager.h>
+#include <OgreRoot.h>
+#include <OgreSceneManager.h>
+#include <OgreTextureManager.h>
 
 namespace
 {
Index: stuntrally/source/ogre/SceneInit.cpp
===================================================================
--- stuntrally.orig/source/ogre/SceneInit.cpp
+++ stuntrally/source/ogre/SceneInit.cpp
@@ -27,6 +27,8 @@
 #include <OgreTerrainGroup.h>
 #include <OgreParticleSystem.h>
 #include <OgreResourceGroupManager.h>
+#include <OgreMeshManager.h>
+#include <OgreTextureManager.h>
 
 using namespace MyGUI;
 using namespace Ogre;

Places

File stuntrally-ogre.patch of Package stuntrally

Places