From d7628b3eb281f72547feac266b932454da0f847d Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 3 Aug 2014 12:20:45 +0200 Subject: [PATCH] Fixed console with Qtmultimedia --- JGE/include/JSoundSystem.h | 6 +++--- projects/mtg/wagic-qt.pro | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/JGE/include/JSoundSystem.h b/JGE/include/JSoundSystem.h index 7c6308aab..5b50b023c 100644 --- a/JGE/include/JSoundSystem.h +++ b/JGE/include/JSoundSystem.h @@ -25,7 +25,7 @@ #elif defined USE_PHONON #include #include -#elif defined QT_CONFIG +#elif (defined QT_CONFIG) #include "QMediaPlayer" #include "QMediaPlaylist" #include "QSoundEffect" @@ -86,7 +86,7 @@ public slots: SLPlayItf playInterface; SLSeekItf seekInterface; SLVolumeItf musicVolumeInterface; -#elif defined QT_CONFIG +#elif (defined QT_CONFIG) QMediaPlaylist* playlist; QMediaPlayer* player; string fullpath; @@ -105,7 +105,7 @@ public: ~JSample(); unsigned long fileSize(); -#ifdef QT_CONFIG +#if (defined QT_CONFIG) QMediaPlayer* effect; // QSoundEffect effect; void* mSample; diff --git a/projects/mtg/wagic-qt.pro b/projects/mtg/wagic-qt.pro index 40e4c5104..9c547d11a 100644 --- a/projects/mtg/wagic-qt.pro +++ b/projects/mtg/wagic-qt.pro @@ -5,7 +5,7 @@ addExclusiveBuilds(graphics, Graphics, console, Console) INCLUDEPATH += ../../JGE/include/qt CONFIG(console, graphics|console){ - QT += core network + QT += core network multimedia QT -= gui DEFINES += CONSOLE_CONFIG @@ -55,6 +55,7 @@ else:CONFIG(console, graphics|console){ SOURCES += \ ../../JGE/src/OutputCapturer.cpp\ + ../../JGE/src/pc/JSfx.cpp\ ../../JGE/src/JGfx-fake.cpp\ ../../JGE/src/Qtconsole.cpp\ }