Fixed SDL build with mingw. In particular, replaced boost dependency by c++11.
This commit is contained in:
@@ -150,7 +150,7 @@ console_main(int argc, char *argv[])
|
||||
|
||||
/* This is where execution begins [windowed apps] */
|
||||
int WINAPI
|
||||
WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPTSTR szCmdLine, int sw)
|
||||
WinMain(HINSTANCE hInst,HINSTANCE hPrev,LPSTR szCmdLine,int sw)
|
||||
{
|
||||
char **argv;
|
||||
int argc;
|
||||
|
||||
@@ -23,7 +23,7 @@ std::string ToHex(T* pointer)
|
||||
return stream.str();
|
||||
}
|
||||
|
||||
#ifdef LINUX
|
||||
#if defined(LINUX) && !defined(OutputDebugString)
|
||||
#define OutputDebugString(val) (std::cerr << val);
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef THREADING_H
|
||||
#define THREADING_H
|
||||
|
||||
#if !defined(PSP) && !defined(QT_CONFIG) && !defined(WP8)
|
||||
#if !defined(PSP) && !defined(QT_CONFIG) && !defined(WP8) && !(defined(SDL_CONFIG) && defined(__MINGW32__))
|
||||
#include <boost/date_time.hpp>
|
||||
|
||||
#ifdef WIN32
|
||||
@@ -537,7 +537,7 @@ namespace boost
|
||||
}
|
||||
}
|
||||
|
||||
#elif defined(WP8)
|
||||
#elif defined(WP8) || (defined(SDL_CONFIG) && defined(__MINGW32__))
|
||||
|
||||
#include <thread>
|
||||
#include <mutex>
|
||||
|
||||
+1
-1
@@ -53,7 +53,7 @@ extern "C" {
|
||||
#include "../../include/JFileSystem.h"
|
||||
#include "../../include/JAssert.h"
|
||||
|
||||
#if (defined WIN32) && (!defined QT_CONFIG)
|
||||
#if (defined WIN32) && (!defined QT_CONFIG) && (!defined __MINGW32__)
|
||||
#ifndef __attribute__
|
||||
#define __attribute__((a))
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user