krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Revert "Allow MinGW64 compilation in Windows/msys"

Browse source 
This reverts commit c3f350e3fb.

Conflicts:
	libs/platform/string.h
This commit is contained in:
cc9cii 2014-02-22 23:45:13 +11:00
parent ac606a865c
commit fcfc8fcccb
6 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -13,7 +13,6 @@ Doxygen
## ides/editors ## ides/editors
*~ *~
*.bak
*.kdev4 *.kdev4
*.swp *.swp
*.swo *.swo

2
apps/openmw/mwrender/videoplayer.cpp
View file

@ -385,7 +385,7 @@ class MovieAudioDecoder : public MWSound::Sound_Decoder
} }
void open(const std::string&) void open(const std::string&)
#ifdef _MSC_VER #ifdef _WIN32
{ fail(std::string("Invalid call to ")+__FUNCSIG__); } { fail(std::string("Invalid call to ")+__FUNCSIG__); }
#else #else
{ fail(std::string("Invalid call to ")+__PRETTY_FUNCTION__); } { fail(std::string("Invalid call to ")+__PRETTY_FUNCTION__); }

2
apps/openmw/mwworld/worldimp.cpp
View file

@ -1,5 +1,5 @@
#include "worldimp.hpp" #include "worldimp.hpp"
#if defined(_WIN32) && !defined(__MINGW32__) #ifdef _WIN32
#include <boost/tr1/tr1/unordered_map> #include <boost/tr1/tr1/unordered_map>
#elif defined HAVE_UNORDERED_MAP #elif defined HAVE_UNORDERED_MAP
#include <unordered_map> #include <unordered_map>

2
components/files/configurationmanager.hpp
View file

@ -1,7 +1,7 @@
#ifndef COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP #ifndef COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP
#define COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP #define COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP
#if defined(_WIN32) && !defined(__MINGW32__) #ifdef _WIN32
#include <boost/tr1/tr1/unordered_map> #include <boost/tr1/tr1/unordered_map>
#elif defined HAVE_UNORDERED_MAP #elif defined HAVE_UNORDERED_MAP
#include <unordered_map> #include <unordered_map>

4
extern/sdl4ogre/sdlwindowhelper.cpp vendored
View file

@ -31,11 +31,7 @@ SDLWindowHelper::SDLWindowHelper (SDL_Window* window, int w, int h,
#ifdef WIN32 #ifdef WIN32
case SDL_SYSWM_WINDOWS: case SDL_SYSWM_WINDOWS:
// Windows code // Windows code
#ifdef __MINGW64__
winHandle = Ogre::StringConverter::toString((DWORD_PTR)wmInfo.info.win.window);
#else
winHandle = Ogre::StringConverter::toString((unsigned long)wmInfo.info.win.window); winHandle = Ogre::StringConverter::toString((unsigned long)wmInfo.info.win.window);
#endif /* __MINGW64__ */
break; break;
#elif __MACOSX__ #elif __MACOSX__
case SDL_SYSWM_COCOA: case SDL_SYSWM_COCOA:

2
libs/platform/string.h
View file

@ -9,7 +9,7 @@
#include <string.h> #include <string.h>
#if (defined(__APPLE__) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1070) || defined(__MINGW32__) #if (defined(__APPLE__) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1070) || defined(__MINGW32__)
// need our own implementation of strnlen // need our own implementation of strnlen
#if defined(__MINGW32__) && !defined(__MINGW64__) #ifdef __MINGW32__
static size_t strnlen(const char *s, size_t n) static size_t strnlen(const char *s, size_t n)
{ {
const char *p = (const char *)memchr(s, 0, n); const char *p = (const char *)memchr(s, 0, n);