Qt: Fix build if QtMultimedia is not installed
Jeffrey Pfau jeffrey@endrift.com
Wed, 10 Dec 2014 19:55:48 -0800
3 files changed,
3 insertions(+),
7 deletions(-)
M
src/platform/qt/AudioProcessor.cpp
→
src/platform/qt/AudioProcessor.cpp
@@ -5,15 +5,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "AudioProcessor.h" -#include "AudioDevice.h" - #ifdef BUILD_SDL #include "AudioProcessorSDL.h" #else #include "AudioProcessorQt.h" #endif - -#include <QAudioOutput> extern "C" { #include "gba-thread.h"
M
src/platform/qt/CMakeLists.txt
→
src/platform/qt/CMakeLists.txt
@@ -30,7 +30,6 @@ return()
endif() set(SOURCE_FILES - AudioDevice.cpp AudioProcessor.cpp ConfigController.cpp Display.cpp@@ -56,7 +55,9 @@
if(BUILD_SDL) list(APPEND SOURCE_FILES AudioProcessorSDL.cpp) elseif(Qt5Multimedia_FOUND) - list(APPEND SOURCE_FILES AudioProcessorQt.cpp) + list(APPEND SOURCE_FILES + AudioProcessorQt.cpp + AudioDevice.cpp) else() message(WARNING "No supported audio modules found") set(BUILD_QT OFF PARENT_SCOPE)
M
src/platform/qt/Window.h
→
src/platform/qt/Window.h
@@ -6,7 +6,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef QGBA_WINDOW #define QGBA_WINDOW -#include <QAudioOutput> #include <QDateTime> #include <QList> #include <QMainWindow>