From 5d7667dc01c6b494278fdb41c1768540297d8b71 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Fri, 31 Jan 2014 21:53:27 +0100 Subject: [PATCH] Cleaned Phonon vs QtMultimedia config --- JGE/include/JSoundSystem.h | 8 ++++---- projects/mtg/wagic.pri | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/JGE/include/JSoundSystem.h b/JGE/include/JSoundSystem.h index 6897fc71c..30be731e8 100644 --- a/JGE/include/JSoundSystem.h +++ b/JGE/include/JSoundSystem.h @@ -25,6 +25,10 @@ #elif defined USE_PHONON #include #include +#elif defined QT_CONFIG +#include "QMediaPlayer" +#include "QMediaPlaylist" +#include "QSoundEffect" #elif defined WIN32 #include #define WITH_FMOD @@ -41,10 +45,6 @@ #include "JAudio.h" #include "JMP3.h" -#elif defined QT_CONFIG -#include "QMediaPlayer" -#include "QMediaPlaylist" -#include "QSoundEffect" #endif #ifdef WITH_FMOD diff --git a/projects/mtg/wagic.pri b/projects/mtg/wagic.pri index 6c8cd4198..7fceea568 100644 --- a/projects/mtg/wagic.pri +++ b/projects/mtg/wagic.pri @@ -41,8 +41,8 @@ INCLUDEPATH += ../../Boost INCLUDEPATH += include unix:!symbian:LIBS += -lz -win32:LIBS += ../../JGE/Dependencies/lib/fmodvc.lib -win32:LIBS += ../../JGE/Dependencies/lib/zlibd.lib +windows:LIBS += ../../JGE/Dependencies/lib/fmodvc.lib +windows:LIBS += ../../JGE/Dependencies/lib/zlibd.lib PRECOMPILED_HEADER = include/PrecompiledHeader.h #DEFINES += TRACK_OBJECT_USAGE