all repos — mgba @ e0851f2f44c8340ad3df2564f4f5bc32d6edc7a1

mGBA Game Boy Advance Emulator

Qt: Fix build if QtMultimedia is not installed
Jeffrey Pfau jeffrey@endrift.com
Wed, 10 Dec 2014 19:55:48 -0800
commit

e0851f2f44c8340ad3df2564f4f5bc32d6edc7a1

parent

29ea8d15390b82148068ea7e67af2316a3634c23

3 files changed, 3 insertions(+), 7 deletions(-)

jump to
M src/platform/qt/AudioProcessor.cppsrc/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.txtsrc/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.hsrc/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>