sdl include fix

This commit is contained in:
doitux
2007-09-02 11:30:48 +00:00
parent 3677a2b4b4
commit ba586fd751
3 changed files with 22 additions and 21 deletions
-11
View File
@@ -11,17 +11,6 @@
//
#include "sdlplayer.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
#include <iostream>
using namespace std;
+14 -2
View File
@@ -14,11 +14,23 @@
#ifndef SDLPLAYER_H
#define SDLPLAYER_H
#include <string>
#include "configfile.h"
#include "qthelper.h"
struct Mix_Chunk;
// 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
#include <iostream>
#include <string>
// struct Mix_Chunk;
/**
@author FThauer FHammer <webmaster@pokerth.net>