all repos — mgba @ 3d113112c48006681f7df1d107517533c29fb97e

mGBA Game Boy Advance Emulator

Qt: Fix non-SQLite3 build
Vicki Pfau vi@endrift.com
Wed, 18 Jan 2017 13:42:14 -0800
commit

3d113112c48006681f7df1d107517533c29fb97e

parent

2e3daaedc208824c9b8a54480bd614160cdda9e7

3 files changed, 12 insertions(+), 2 deletions(-)

jump to
M src/platform/qt/CMakeLists.txtsrc/platform/qt/CMakeLists.txt

@@ -68,7 +68,6 @@ endif()

set(SOURCE_FILES AboutScreen.cpp - ArchiveInspector.cpp AssetTile.cpp AssetView.cpp AudioProcessor.cpp

@@ -88,7 +87,6 @@ IOViewer.cpp

InputController.cpp InputProfile.cpp KeyEditor.cpp - LibraryModel.cpp LoadSaveState.cpp LogController.cpp LogView.cpp

@@ -187,6 +185,12 @@ endif()

if(USE_GDB_STUB) list(APPEND SOURCE_FILES GDBController.cpp GDBWindow.cpp) +endif() + +if(USE_SQLITE3) + list(APPEND SOURCE_FILES + ArchiveInspector.cpp + LibraryModel.cpp) endif() qt5_add_resources(RESOURCES resources.qrc)
M src/platform/qt/Window.cppsrc/platform/qt/Window.cpp

@@ -15,7 +15,9 @@ #include <QPainter>

#include <QStackedLayout> #include "AboutScreen.h" +#ifdef USE_SQLITE3 #include "ArchiveInspector.h" +#endif #include "CheatsView.h" #include "ConfigController.h" #include "DebuggerConsole.h"

@@ -362,6 +364,7 @@ m_controller->loadGame(filename);

} } +#ifdef USE_SQLITE3 void Window::selectROMInArchive() { QString filename = GBAApp::app()->getOpenFileName(this, tr("Select ROM"), getFiltersArchive()); if (filename.isEmpty()) {

@@ -378,6 +381,7 @@ });

archiveInspector->setAttribute(Qt::WA_DeleteOnClose); archiveInspector->show(); } +#endif void Window::replaceROM() { QString filename = GBAApp::app()->getOpenFileName(this, tr("Select ROM"), getFilters());
M src/platform/qt/Window.hsrc/platform/qt/Window.h

@@ -57,7 +57,9 @@ void fpsTargetChanged(float target);

public slots: void selectROM(); +#ifdef USE_SQLITE3 void selectROMInArchive(); +#endif void selectSave(bool temporary); void selectBIOS(); void selectPatch();