Merge remote-tracking branch 'corristo/master'

CMakeLists.txt

@@ -83,10 +83,6 @@ set(OENGINE_OGRE
   ${LIBDIR}/openengine/ogre/imagerotate.cpp
 )
 
-if (APPLE)
-    set(OENGINE_OGRE ${OENGINE_OGRE} ${LIBDIR}/openengine/ogre/osx_utils.mm)
-endif ()
-
 set(OENGINE_GUI
   ${LIBDIR}/openengine/gui/manager.cpp
 )

extern/sdl4ogre/CMakeLists.txt

@@ -8,6 +8,10 @@ set(SDL4OGRE_SOURCE_FILES
 	sdlwindowhelper.cpp
 )
 
+if (APPLE)
+    set(SDL4OGRE_SOURCE_FILES ${SDL4OGRE_SOURCE_FILES} osx_utils.mm)
+endif ()
+
 set(SDL4OGRE_HEADER_FILES
 	OISCompat.h
 	cursormanager.hpp

extern/sdl4ogre/osx_utils.h

@@ -0,0 +1,12 @@
+#ifndef SDL4OGRE_OSX_UTILS_H
+#define SDL4OGRE_OSX_UTILS_H
+
+#include <SDL_syswm.h>
+
+namespace SFO {
+
+extern unsigned long WindowContentViewHandle(SDL_SysWMinfo &info);
+
+}
+
+#endif //  SDL4OGRE_OSX_UTILS_H

extern/sdl4ogre/osx_utils.mm

@@ -2,8 +2,7 @@
 
 #import <AppKit/NSWindow.h>
 
-namespace OEngine {
+namespace SFO {
-namespace Render {
 
 unsigned long WindowContentViewHandle(SDL_SysWMinfo &info)
 {
@@ -13,4 +12,3 @@ unsigned long WindowContentViewHandle(SDL_SysWMinfo &info)
 }
 
 }
-}

extern/sdl4ogre/sdlinputwrapper.cpp

@@ -119,21 +119,21 @@ namespace SFO
 				int w,h;
 				SDL_GetWindowSize(mSDLWindow, &w, &h);
 				// TODO: Fix Ogre to handle this more consistently
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#if OGRE_PLATFORM == OGRE_PLATFORM_LINUX
-				mOgreWindow->windowMovedOrResized();
-#else
 				mOgreWindow->resize(w, h);
+#else
+				mOgreWindow->windowMovedOrResized();
 #endif
 				if (mWindowListener)
 					mWindowListener->windowResized(evt.window.data1, evt.window.data2);
 
 			case SDL_WINDOWEVENT_RESIZED:
 				// TODO: Fix Ogre to handle this more consistently
-				#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#if OGRE_PLATFORM == OGRE_PLATFORM_LINUX
-				mOgreWindow->windowMovedOrResized();
-				#else
 				mOgreWindow->resize(evt.window.data1, evt.window.data2);
-				#endif
+#else
+				mOgreWindow->windowMovedOrResized();
+#endif
 				if (mWindowListener)
 					mWindowListener->windowResized(evt.window.data1, evt.window.data2);
 				break;

extern/sdl4ogre/sdlwindowhelper.cpp

@@ -6,6 +6,10 @@
 #include <SDL_syswm.h>
 #include <SDL_endian.h>
 
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+#include "osx_utils.h"
+#endif
+
 namespace SFO
 {
 

libs/openengine/ogre/osx_utils.h

@@ -1,14 +0,0 @@
-#ifndef OENGINE_OGRE_OSX_UTILS_H
-#define OENGINE_OGRE_OSX_UTILS_H
-
-#include <SDL_syswm.h>
-
-namespace OEngine {
-namespace Render {
-
-extern unsigned long WindowContentViewHandle(SDL_SysWMinfo &info);
-
-}
-}
-
-#endif

libs/openengine/ogre/renderer.cpp

@@ -24,10 +24,6 @@
 #include <cstdlib>
 #include <stdexcept>
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
-#include "osx_utils.h"
-#endif
-
 using namespace Ogre;
 using namespace OEngine::Render;