Trying to fix SDL definition conflict.

This commit is contained in:
lotodore committed 2007-09-03 19:17:45 +00:00
1 parent 23d9bb71c3
commit dee51b3df2
2 files changed
+5 -4

No files matched your search

+5
View File
@@ -11,6 +11,11 @@
//
#include "sdlplayer.h"
#if (defined _WIN32) || (defined __APPLE__)
#include <SDL.h>
#else
#include <SDL/SDL.h>
#endif
using namespace std;
-4
View File
@@ -17,13 +17,9 @@
#include "configfile.h"
#include "qthelper.h"
// Include SDL here and not in headers to prevent
// conflicts with QT includes.
#if (defined _WIN32) || (defined __APPLE__)
#include <SDL.h>
#include <SDL_mixer.h>
#else
#include <SDL/SDL.h>
#include <SDL/SDL_mixer.h>
#endif