Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned Phonon vs QtMultimedia config

Browse Source
This commit is contained in:
xawotihs
2014-01-31 21:53:27 +01:00
parent 18383579e9
commit 5d7667dc01
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
JGE/include/JSoundSystem.h
View File

@@ -25,6 +25,10 @@
#elif defined USE_PHONON #elif defined USE_PHONON
#include <phonon/AudioOutput> #include <phonon/AudioOutput>
#include <phonon/MediaObject> #include <phonon/MediaObject>
#elif defined QT_CONFIG
#include "QMediaPlayer"
#include "QMediaPlaylist"
#include "QSoundEffect"
#elif defined WIN32 #elif defined WIN32
#include <windows.h> #include <windows.h>
#define WITH_FMOD #define WITH_FMOD
@@ -41,10 +45,6 @@
#include "JAudio.h" #include "JAudio.h"
#include "JMP3.h" #include "JMP3.h"
#elif defined QT_CONFIG
#include "QMediaPlayer"
#include "QMediaPlaylist"
#include "QSoundEffect"
#endif #endif
#ifdef WITH_FMOD #ifdef WITH_FMOD

4
projects/mtg/wagic.pri
View File

@@ -41,8 +41,8 @@ INCLUDEPATH += ../../Boost
INCLUDEPATH += include INCLUDEPATH += include
unix:!symbian:LIBS += -lz unix:!symbian:LIBS += -lz
win32:LIBS += ../../JGE/Dependencies/lib/fmodvc.lib windows:LIBS += ../../JGE/Dependencies/lib/fmodvc.lib
win32:LIBS += ../../JGE/Dependencies/lib/zlibd.lib windows:LIBS += ../../JGE/Dependencies/lib/zlibd.lib
PRECOMPILED_HEADER = include/PrecompiledHeader.h PRECOMPILED_HEADER = include/PrecompiledHeader.h
#DEFINES += TRACK_OBJECT_USAGE #DEFINES += TRACK_OBJECT_USAGE