From 295111c7e152e9a15e1289a3519f62a4bb089c76 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Wed, 10 Dec 2014 19:55:48 -0800 Subject: [PATCH] Qt: Fix build if QtMultimedia is not installed --- src/platform/qt/AudioProcessor.cpp | 4 ---- src/platform/qt/CMakeLists.txt | 5 +++-- src/platform/qt/Window.h | 1 - 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/platform/qt/AudioProcessor.cpp b/src/platform/qt/AudioProcessor.cpp index 43bc89487..5c7118a4b 100644 --- a/src/platform/qt/AudioProcessor.cpp +++ b/src/platform/qt/AudioProcessor.cpp @@ -5,16 +5,12 @@ * 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 - extern "C" { #include "gba-thread.h" } diff --git a/src/platform/qt/CMakeLists.txt b/src/platform/qt/CMakeLists.txt index 8c38858eb..7c0f79074 100644 --- a/src/platform/qt/CMakeLists.txt +++ b/src/platform/qt/CMakeLists.txt @@ -30,7 +30,6 @@ if(NOT Qt5OpenGL_FOUND OR NOT Qt5Widgets_FOUND OR NOT OPENGL_FOUND) endif() set(SOURCE_FILES - AudioDevice.cpp AudioProcessor.cpp ConfigController.cpp Display.cpp @@ -56,7 +55,9 @@ qt5_wrap_ui(UI_FILES 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) diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h index a23463a83..780743298 100644 --- a/src/platform/qt/Window.h +++ b/src/platform/qt/Window.h @@ -6,7 +6,6 @@ #ifndef QGBA_WINDOW #define QGBA_WINDOW -#include #include #include #include