ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix build if QtMultimedia is not installed

This commit is contained in:
Jeffrey Pfau 2014-12-10 19:55:48 -08:00
parent 29ea8d1539
commit e0851f2f44
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/platform/qt/AudioProcessor.cpp
View File

@ -5,16 +5,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "AudioProcessor.h" #include "AudioProcessor.h"
#include "AudioDevice.h"
#ifdef BUILD_SDL #ifdef BUILD_SDL
#include "AudioProcessorSDL.h" #include "AudioProcessorSDL.h"
#else #else
#include "AudioProcessorQt.h" #include "AudioProcessorQt.h"
#endif #endif
#include <QAudioOutput>
extern "C" { extern "C" {
#include "gba-thread.h" #include "gba-thread.h"
} }

5
src/platform/qt/CMakeLists.txt
View File

@ -30,7 +30,6 @@ if(NOT Qt5OpenGL_FOUND OR NOT Qt5Widgets_FOUND OR NOT OPENGL_FOUND)
endif() endif()
set(SOURCE_FILES set(SOURCE_FILES
AudioDevice.cpp
AudioProcessor.cpp AudioProcessor.cpp
ConfigController.cpp ConfigController.cpp
Display.cpp Display.cpp
@ -56,7 +55,9 @@ qt5_wrap_ui(UI_FILES
if(BUILD_SDL) if(BUILD_SDL)
list(APPEND SOURCE_FILES AudioProcessorSDL.cpp) list(APPEND SOURCE_FILES AudioProcessorSDL.cpp)
elseif(Qt5Multimedia_FOUND) elseif(Qt5Multimedia_FOUND)
list(APPEND SOURCE_FILES AudioProcessorQt.cpp) list(APPEND SOURCE_FILES
AudioProcessorQt.cpp
AudioDevice.cpp)
else() else()
message(WARNING "No supported audio modules found") message(WARNING "No supported audio modules found")
set(BUILD_QT OFF PARENT_SCOPE) set(BUILD_QT OFF PARENT_SCOPE)

1
src/platform/qt/Window.h
View File

@ -6,7 +6,6 @@
#ifndef QGBA_WINDOW #ifndef QGBA_WINDOW
#define QGBA_WINDOW #define QGBA_WINDOW
#include <QAudioOutput>
#include <QDateTime> #include <QDateTime>
#include <QList> #include <QList>
#include <QMainWindow> #include <QMainWindow>