sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Trying to fix SDL definition conflict.

Browse Source
This commit is contained in:
lotodore
2007-09-03 19:17:45 +00:00
parent 23d9bb71c3
commit dee51b3df2
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/sound/sdlplayer.cpp
+5
View File
@@ -11,6 +11,11 @@
// //
#include "sdlplayer.h" #include "sdlplayer.h"
#if (defined _WIN32) || (defined __APPLE__)
#include <SDL.h>
#else
#include <SDL/SDL.h>
#endif
using namespace std; using namespace std;
src/gui/qt/sound/sdlplayer.h
-4
View File
@@ -17,13 +17,9 @@
#include "configfile.h" #include "configfile.h"
#include "qthelper.h" #include "qthelper.h"
// Include SDL here and not in headers to prevent
// conflicts with QT includes.
#if (defined _WIN32) || (defined __APPLE__) #if (defined _WIN32) || (defined __APPLE__)
#include <SDL.h>
#include <SDL_mixer.h> #include <SDL_mixer.h>
#else #else
#include <SDL/SDL.h>
#include <SDL/SDL_mixer.h> #include <SDL/SDL_mixer.h>
#endif #endif