mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-20 15:40:32 +00:00
Code Issues Projects Releases Wiki Activity

Fixed compilation os OS X after moving SDL windowing code to extern/sdl4ogre

Browse Source
This commit is contained in:
Nikolay Kasyanov 2013-07-31 22:30:52 +04:00
parent 4dfd5282ab
commit 66608d5c92
7 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -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
)

4
extern/sdl4ogre/CMakeLists.txt vendored
View File

@ -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

12
extern/sdl4ogre/osx_utils.h vendored Normal file
View File

@ -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

4
libs/openengine/ogre/osx_utils.mm → extern/sdl4ogre/osx_utils.mm vendored
View File

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

4
extern/sdl4ogre/sdlwindowhelper.cpp vendored
View File

@ -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
{

14
libs/openengine/ogre/osx_utils.h
View File

@ -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

4
libs/openengine/ogre/renderer.cpp
View File

@ -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;