From 51e1bd7ac4ab043b85879fc2dc3411d782078186 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Wed, 8 Jun 2022 12:45:12 -0400 Subject: [PATCH] Rearrange source directories --- CMakeLists.txt | 85 +------------------ launcher/CMakeLists.txt | 44 ++++++++++ launcher/cli/CMakeLists.txt | 12 +++ .../cli/include}/cmdinterface.h | 0 {src => launcher/cli/src}/cmdinterface.cpp | 0 launcher/core/CMakeLists.txt | 53 ++++++++++++ {include => launcher/core/include}/blowfish.h | 0 {include => launcher/core/include}/config.h | 0 .../core/include}/dxvkinstaller.h | 0 .../core/include}/encryptedarg.h | 0 .../core/include}/gameinstaller.h | 0 .../core/include}/gameparser.h | 0 {include => launcher/core/include}/headline.h | 0 .../core/include}/launchercore.h | 0 .../core/include}/sapphirelauncher.h | 0 .../core/include}/squareboot.h | 0 .../core/include}/squarelauncher.h | 0 {include => launcher/core/include}/watchdog.h | 0 {src => launcher/core/src}/blowfish.cpp | 0 {src => launcher/core/src}/dxvkinstaller.cpp | 0 {src => launcher/core/src}/encryptedarg.cpp | 0 {src => launcher/core/src}/gameinstaller.cpp | 0 {src => launcher/core/src}/gameparser.cpp | 0 {src => launcher/core/src}/headline.cpp | 0 {src => launcher/core/src}/launchercore.cpp | 0 .../core/src}/sapphirelauncher.cpp | 0 {src => launcher/core/src}/squareboot.cpp | 0 {src => launcher/core/src}/squarelauncher.cpp | 0 {src => launcher/core/src}/watchdog.cpp | 0 launcher/desktop/CMakeLists.txt | 25 ++++++ .../desktop/include}/aboutwindow.h | 0 .../desktop/include}/assetupdater.h | 0 .../desktop/include}/bannerwidget.h | 0 .../desktop/include}/desktopinterface.h | 0 .../include}/gamescopesettingswindow.h | 0 .../desktop/include}/launcherwindow.h | 0 .../desktop/include}/settingswindow.h | 0 {src => launcher/desktop/src}/aboutwindow.cpp | 0 .../desktop/src}/assetupdater.cpp | 0 .../desktop/src}/bannerwidget.cpp | 0 .../desktop/src}/desktopinterface.cpp | 0 .../desktop/src}/gamescopesettingswindow.cpp | 0 .../desktop/src}/launcherwindow.cpp | 0 .../desktop/src}/settingswindow.cpp | 0 {src => launcher}/main.cpp | 2 +- launcher/tablet/CMakeLists.txt | 13 +++ .../tablet/include}/tabletinterface.h | 0 {qml => launcher/tablet/qml}/main.qml | 0 {qml => launcher/tablet/qml}/qml.qrc | 0 .../tablet/src}/tabletinterface.cpp | 2 +- 50 files changed, 150 insertions(+), 86 deletions(-) create mode 100644 launcher/CMakeLists.txt create mode 100644 launcher/cli/CMakeLists.txt rename {include => launcher/cli/include}/cmdinterface.h (100%) rename {src => launcher/cli/src}/cmdinterface.cpp (100%) create mode 100644 launcher/core/CMakeLists.txt rename {include => launcher/core/include}/blowfish.h (100%) rename {include => launcher/core/include}/config.h (100%) rename {include => launcher/core/include}/dxvkinstaller.h (100%) rename {include => launcher/core/include}/encryptedarg.h (100%) rename {include => launcher/core/include}/gameinstaller.h (100%) rename {include => launcher/core/include}/gameparser.h (100%) rename {include => launcher/core/include}/headline.h (100%) rename {include => launcher/core/include}/launchercore.h (100%) rename {include => launcher/core/include}/sapphirelauncher.h (100%) rename {include => launcher/core/include}/squareboot.h (100%) rename {include => launcher/core/include}/squarelauncher.h (100%) rename {include => launcher/core/include}/watchdog.h (100%) rename {src => launcher/core/src}/blowfish.cpp (100%) rename {src => launcher/core/src}/dxvkinstaller.cpp (100%) rename {src => launcher/core/src}/encryptedarg.cpp (100%) rename {src => launcher/core/src}/gameinstaller.cpp (100%) rename {src => launcher/core/src}/gameparser.cpp (100%) rename {src => launcher/core/src}/headline.cpp (100%) rename {src => launcher/core/src}/launchercore.cpp (100%) rename {src => launcher/core/src}/sapphirelauncher.cpp (100%) rename {src => launcher/core/src}/squareboot.cpp (100%) rename {src => launcher/core/src}/squarelauncher.cpp (100%) rename {src => launcher/core/src}/watchdog.cpp (100%) create mode 100644 launcher/desktop/CMakeLists.txt rename {include => launcher/desktop/include}/aboutwindow.h (100%) rename {include => launcher/desktop/include}/assetupdater.h (100%) rename {include => launcher/desktop/include}/bannerwidget.h (100%) rename {include => launcher/desktop/include}/desktopinterface.h (100%) rename {include => launcher/desktop/include}/gamescopesettingswindow.h (100%) rename {include => launcher/desktop/include}/launcherwindow.h (100%) rename {include => launcher/desktop/include}/settingswindow.h (100%) rename {src => launcher/desktop/src}/aboutwindow.cpp (100%) rename {src => launcher/desktop/src}/assetupdater.cpp (100%) rename {src => launcher/desktop/src}/bannerwidget.cpp (100%) rename {src => launcher/desktop/src}/desktopinterface.cpp (100%) rename {src => launcher/desktop/src}/gamescopesettingswindow.cpp (100%) rename {src => launcher/desktop/src}/launcherwindow.cpp (100%) rename {src => launcher/desktop/src}/settingswindow.cpp (100%) rename {src => launcher}/main.cpp (97%) create mode 100644 launcher/tablet/CMakeLists.txt rename {include => launcher/tablet/include}/tabletinterface.h (100%) rename {qml => launcher/tablet/qml}/main.qml (100%) rename {qml => launcher/tablet/qml}/qml.qrc (100%) rename {src => launcher/tablet/src}/tabletinterface.cpp (73%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c4e0673..4c9bc5c 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,40 +16,6 @@ if(ENABLE_WATCHDOG) pkg_search_module(LEPTONICA REQUIRED lept) endif() -set(SRC - src/main.cpp - src/launchercore.cpp - include/launchercore.h - include/squarelauncher.h - src/sapphirelauncher.cpp - src/squareboot.cpp - src/squarelauncher.cpp - src/settingswindow.cpp - src/blowfish.cpp - src/assetupdater.cpp - include/assetupdater.h - src/launcherwindow.cpp - include/launcherwindow.h - src/gamescopesettingswindow.cpp - include/gamescopesettingswindow.h - include/headline.h - src/headline.cpp - include/config.h - include/gameinstaller.h - src/gameinstaller.cpp - src/encryptedarg.cpp - src/aboutwindow.cpp - include/aboutwindow.h - src/bannerwidget.cpp - include/bannerwidget.h - include/desktopinterface.h - include/cmdinterface.h - src/cmdinterface.cpp - src/desktopinterface.cpp - include/tabletinterface.h - src/tabletinterface.cpp - qml/qml.qrc) - include(FetchContent) if(NOT USE_OWN_LIBRARIES) @@ -133,9 +99,6 @@ endif() add_subdirectory(external) -set(LIBRARIES - Qt5::Core Qt5::Widgets Qt5::Network Qt5::Quick ${LIBRARIES}) - if(ENABLE_WATCHDOG) set(LIBRARIES ${LIBRARIES} ${TESSERACT_LIBRARIES} ${LEPTONICA_LIBRARIES}) @@ -153,50 +116,4 @@ if(ENABLE_WATCHDOG) Xrender) endif() -add_executable(astra ${SRC}) - -target_link_libraries(astra PUBLIC ${LIBRARIES} libxiv) -target_compile_features(astra PUBLIC cxx_std_17) -set_target_properties(astra PROPERTIES CXX_EXTENSIONS OFF) - -file(READ ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE LICENSE_TXT) -STRING(REPLACE "\n" " \\n" LICENSE_TXT ${LICENSE_TXT}) -STRING(REPLACE "\"" "\"\"" LICENSE_TXT ${LICENSE_TXT}) - -configure_file(${CMAKE_CURRENT_LIST_DIR}/cmake/license.h.in - ${CMAKE_BINARY_DIR}/license.h) - -target_include_directories(astra - PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE - ${KEYCHAIN_INCLUDE_DIRS} - ${QUAZIP_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}) - -if(ENABLE_WATCHDOG) - target_include_directories(astra PRIVATE ${TESSERACT_INCLUDE_DIRS} ${LEPTONICA_INCLUDE_DIRS}) - - target_compile_definitions(astra PRIVATE ENABLE_WATCHDOG) -endif() - -if(BUILD_FLATPAK) - target_compile_definitions(astra PRIVATE FLATPAK) -endif() - -install(TARGETS astra - DESTINATION "${INSTALL_BIN_PATH}") - -if(WIN32) - get_target_property(QMAKE_EXE Qt5::qmake IMPORTED_LOCATION) - get_filename_component(QT_BIN_DIR "${QMAKE_EXE}" DIRECTORY) - - find_program(WINDEPLOYQT_ENV_SETUP qtenv2.bat HINTS "${QT_BIN_DIR}") - find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${QT_BIN_DIR}") - - # Run windeployqt immediately after build - add_custom_command(TARGET astra - POST_BUILD - COMMAND "${WINDEPLOYQT_ENV_SETUP}" && "${WINDEPLOYQT_EXECUTABLE}" \"$\" - ) -endif() +add_subdirectory(launcher) \ No newline at end of file diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt new file mode 100644 index 0000000..46ac528 --- /dev/null +++ b/launcher/CMakeLists.txt @@ -0,0 +1,44 @@ +add_subdirectory(core) +add_subdirectory(cli) +add_subdirectory(desktop) +add_subdirectory(tablet) + +add_executable(astra main.cpp) + +target_link_libraries(astra PUBLIC + ${LIBRARIES} + libxiv + astra_core + astra_desktop + astra_cli + astra_tablet) +target_compile_features(astra PUBLIC cxx_std_17) +set_target_properties(astra PROPERTIES CXX_EXTENSIONS OFF) + +file(READ ${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE LICENSE_TXT) +STRING(REPLACE "\n" " \\n" LICENSE_TXT ${LICENSE_TXT}) +STRING(REPLACE "\"" "\"\"" LICENSE_TXT ${LICENSE_TXT}) + +configure_file(${CMAKE_CURRENT_LIST_DIR}/../cmake/license.h.in + ${CMAKE_BINARY_DIR}/license.h) + +if(BUILD_FLATPAK) + target_compile_definitions(astra PRIVATE FLATPAK) +endif() + +install(TARGETS astra + DESTINATION "${INSTALL_BIN_PATH}") + +if(WIN32) + get_target_property(QMAKE_EXE Qt5::qmake IMPORTED_LOCATION) + get_filename_component(QT_BIN_DIR "${QMAKE_EXE}" DIRECTORY) + + find_program(WINDEPLOYQT_ENV_SETUP qtenv2.bat HINTS "${QT_BIN_DIR}") + find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${QT_BIN_DIR}") + + # Run windeployqt immediately after build + add_custom_command(TARGET astra + POST_BUILD + COMMAND "${WINDEPLOYQT_ENV_SETUP}" && "${WINDEPLOYQT_EXECUTABLE}" \"$\" + ) +endif() diff --git a/launcher/cli/CMakeLists.txt b/launcher/cli/CMakeLists.txt new file mode 100644 index 0000000..ad03ebd --- /dev/null +++ b/launcher/cli/CMakeLists.txt @@ -0,0 +1,12 @@ +set(HEADERS + include/cmdinterface.h) + +set(SRC + src/cmdinterface.cpp) + +add_library(astra_cli STATIC ${HEADERS} ${SRC}) +target_include_directories(astra_cli PUBLIC include) +target_link_libraries(astra_cli PUBLIC + astra_core + Qt5::Core + Qt5::Network) \ No newline at end of file diff --git a/include/cmdinterface.h b/launcher/cli/include/cmdinterface.h similarity index 100% rename from include/cmdinterface.h rename to launcher/cli/include/cmdinterface.h diff --git a/src/cmdinterface.cpp b/launcher/cli/src/cmdinterface.cpp similarity index 100% rename from src/cmdinterface.cpp rename to launcher/cli/src/cmdinterface.cpp diff --git a/launcher/core/CMakeLists.txt b/launcher/core/CMakeLists.txt new file mode 100644 index 0000000..8db3462 --- /dev/null +++ b/launcher/core/CMakeLists.txt @@ -0,0 +1,53 @@ +set(HEADERS + include/blowfish.h + include/config.h + include/dxvkinstaller.h + include/encryptedarg.h + include/gameinstaller.h + include/headline.h + include/launchercore.h + include/sapphirelauncher.h + include/squareboot.h + include/squarelauncher.h) + +set(SRC + src/blowfish.cpp + src/dxvkinstaller.cpp + src/encryptedarg.cpp + src/gameinstaller.cpp + src/headline.cpp + src/launchercore.cpp + src/sapphirelauncher.cpp + src/squareboot.cpp + src/squarelauncher.cpp) + +if(ENABLE_WATCHDOG) + set(HEADERS ${HEADERS} + include/gameparser.h + include/watchdog.h) + + set(SRC ${SRC} + src/gameparser.cpp + src/watchdog.cpp) +endif() + +add_library(astra_core STATIC ${HEADERS} ${SRC}) +target_include_directories(astra_core PUBLIC + ${KEYCHAIN_INCLUDE_DIRS} + ${QUAZIP_INCLUDE_DIRS} + ${CMAKE_BINARY_DIR} + include) +target_link_libraries(astra_core PUBLIC + libxiv + ${LIBRARIES} + Qt5::Core + Qt5::Network + Qt5::Widgets # widgets is required by watchdog, to be fixed/removed later + PRIVATE + astra_desktop) # desktop is currently required by the core, to be fixed/removed later + +if(ENABLE_WATCHDOG) + target_include_directories(astra_core PUBLIC ${TESSERACT_INCLUDE_DIRS} ${LEPTONICA_INCLUDE_DIRS}) + + target_compile_definitions(astra_core PUBLIC ENABLE_WATCHDOG) +endif() diff --git a/include/blowfish.h b/launcher/core/include/blowfish.h similarity index 100% rename from include/blowfish.h rename to launcher/core/include/blowfish.h diff --git a/include/config.h b/launcher/core/include/config.h similarity index 100% rename from include/config.h rename to launcher/core/include/config.h diff --git a/include/dxvkinstaller.h b/launcher/core/include/dxvkinstaller.h similarity index 100% rename from include/dxvkinstaller.h rename to launcher/core/include/dxvkinstaller.h diff --git a/include/encryptedarg.h b/launcher/core/include/encryptedarg.h similarity index 100% rename from include/encryptedarg.h rename to launcher/core/include/encryptedarg.h diff --git a/include/gameinstaller.h b/launcher/core/include/gameinstaller.h similarity index 100% rename from include/gameinstaller.h rename to launcher/core/include/gameinstaller.h diff --git a/include/gameparser.h b/launcher/core/include/gameparser.h similarity index 100% rename from include/gameparser.h rename to launcher/core/include/gameparser.h diff --git a/include/headline.h b/launcher/core/include/headline.h similarity index 100% rename from include/headline.h rename to launcher/core/include/headline.h diff --git a/include/launchercore.h b/launcher/core/include/launchercore.h similarity index 100% rename from include/launchercore.h rename to launcher/core/include/launchercore.h diff --git a/include/sapphirelauncher.h b/launcher/core/include/sapphirelauncher.h similarity index 100% rename from include/sapphirelauncher.h rename to launcher/core/include/sapphirelauncher.h diff --git a/include/squareboot.h b/launcher/core/include/squareboot.h similarity index 100% rename from include/squareboot.h rename to launcher/core/include/squareboot.h diff --git a/include/squarelauncher.h b/launcher/core/include/squarelauncher.h similarity index 100% rename from include/squarelauncher.h rename to launcher/core/include/squarelauncher.h diff --git a/include/watchdog.h b/launcher/core/include/watchdog.h similarity index 100% rename from include/watchdog.h rename to launcher/core/include/watchdog.h diff --git a/src/blowfish.cpp b/launcher/core/src/blowfish.cpp similarity index 100% rename from src/blowfish.cpp rename to launcher/core/src/blowfish.cpp diff --git a/src/dxvkinstaller.cpp b/launcher/core/src/dxvkinstaller.cpp similarity index 100% rename from src/dxvkinstaller.cpp rename to launcher/core/src/dxvkinstaller.cpp diff --git a/src/encryptedarg.cpp b/launcher/core/src/encryptedarg.cpp similarity index 100% rename from src/encryptedarg.cpp rename to launcher/core/src/encryptedarg.cpp diff --git a/src/gameinstaller.cpp b/launcher/core/src/gameinstaller.cpp similarity index 100% rename from src/gameinstaller.cpp rename to launcher/core/src/gameinstaller.cpp diff --git a/src/gameparser.cpp b/launcher/core/src/gameparser.cpp similarity index 100% rename from src/gameparser.cpp rename to launcher/core/src/gameparser.cpp diff --git a/src/headline.cpp b/launcher/core/src/headline.cpp similarity index 100% rename from src/headline.cpp rename to launcher/core/src/headline.cpp diff --git a/src/launchercore.cpp b/launcher/core/src/launchercore.cpp similarity index 100% rename from src/launchercore.cpp rename to launcher/core/src/launchercore.cpp diff --git a/src/sapphirelauncher.cpp b/launcher/core/src/sapphirelauncher.cpp similarity index 100% rename from src/sapphirelauncher.cpp rename to launcher/core/src/sapphirelauncher.cpp diff --git a/src/squareboot.cpp b/launcher/core/src/squareboot.cpp similarity index 100% rename from src/squareboot.cpp rename to launcher/core/src/squareboot.cpp diff --git a/src/squarelauncher.cpp b/launcher/core/src/squarelauncher.cpp similarity index 100% rename from src/squarelauncher.cpp rename to launcher/core/src/squarelauncher.cpp diff --git a/src/watchdog.cpp b/launcher/core/src/watchdog.cpp similarity index 100% rename from src/watchdog.cpp rename to launcher/core/src/watchdog.cpp diff --git a/launcher/desktop/CMakeLists.txt b/launcher/desktop/CMakeLists.txt new file mode 100644 index 0000000..ce7d35e --- /dev/null +++ b/launcher/desktop/CMakeLists.txt @@ -0,0 +1,25 @@ +set(HEADERS + include/aboutwindow.h + include/assetupdater.h + include/bannerwidget.h + include/desktopinterface.h + include/gamescopesettingswindow.h + include/launcherwindow.h + include/settingswindow.h) + +set(SRC + src/aboutwindow.cpp + src/assetupdater.cpp + src/bannerwidget.cpp + src/desktopinterface.cpp + src/gamescopesettingswindow.cpp + src/launcherwindow.cpp + src/settingswindow.cpp) + +add_library(astra_desktop STATIC ${HEADERS} ${SRC}) +target_include_directories(astra_desktop PUBLIC include) +target_link_libraries(astra_desktop PUBLIC + astra_core + Qt5::Core + Qt5::Widgets + Qt5::Network) \ No newline at end of file diff --git a/include/aboutwindow.h b/launcher/desktop/include/aboutwindow.h similarity index 100% rename from include/aboutwindow.h rename to launcher/desktop/include/aboutwindow.h diff --git a/include/assetupdater.h b/launcher/desktop/include/assetupdater.h similarity index 100% rename from include/assetupdater.h rename to launcher/desktop/include/assetupdater.h diff --git a/include/bannerwidget.h b/launcher/desktop/include/bannerwidget.h similarity index 100% rename from include/bannerwidget.h rename to launcher/desktop/include/bannerwidget.h diff --git a/include/desktopinterface.h b/launcher/desktop/include/desktopinterface.h similarity index 100% rename from include/desktopinterface.h rename to launcher/desktop/include/desktopinterface.h diff --git a/include/gamescopesettingswindow.h b/launcher/desktop/include/gamescopesettingswindow.h similarity index 100% rename from include/gamescopesettingswindow.h rename to launcher/desktop/include/gamescopesettingswindow.h diff --git a/include/launcherwindow.h b/launcher/desktop/include/launcherwindow.h similarity index 100% rename from include/launcherwindow.h rename to launcher/desktop/include/launcherwindow.h diff --git a/include/settingswindow.h b/launcher/desktop/include/settingswindow.h similarity index 100% rename from include/settingswindow.h rename to launcher/desktop/include/settingswindow.h diff --git a/src/aboutwindow.cpp b/launcher/desktop/src/aboutwindow.cpp similarity index 100% rename from src/aboutwindow.cpp rename to launcher/desktop/src/aboutwindow.cpp diff --git a/src/assetupdater.cpp b/launcher/desktop/src/assetupdater.cpp similarity index 100% rename from src/assetupdater.cpp rename to launcher/desktop/src/assetupdater.cpp diff --git a/src/bannerwidget.cpp b/launcher/desktop/src/bannerwidget.cpp similarity index 100% rename from src/bannerwidget.cpp rename to launcher/desktop/src/bannerwidget.cpp diff --git a/src/desktopinterface.cpp b/launcher/desktop/src/desktopinterface.cpp similarity index 100% rename from src/desktopinterface.cpp rename to launcher/desktop/src/desktopinterface.cpp diff --git a/src/gamescopesettingswindow.cpp b/launcher/desktop/src/gamescopesettingswindow.cpp similarity index 100% rename from src/gamescopesettingswindow.cpp rename to launcher/desktop/src/gamescopesettingswindow.cpp diff --git a/src/launcherwindow.cpp b/launcher/desktop/src/launcherwindow.cpp similarity index 100% rename from src/launcherwindow.cpp rename to launcher/desktop/src/launcherwindow.cpp diff --git a/src/settingswindow.cpp b/launcher/desktop/src/settingswindow.cpp similarity index 100% rename from src/settingswindow.cpp rename to launcher/desktop/src/settingswindow.cpp diff --git a/src/main.cpp b/launcher/main.cpp similarity index 97% rename from src/main.cpp rename to launcher/main.cpp index 8290d80..48b947c 100755 --- a/src/main.cpp +++ b/launcher/main.cpp @@ -12,7 +12,7 @@ #include "config.h" #include "desktopinterface.h" #include "cmdinterface.h" -#include "tabletinterface.h" +#include "../launcher/tablet/include/tabletinterface.h" int main(int argc, char* argv[]) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); diff --git a/launcher/tablet/CMakeLists.txt b/launcher/tablet/CMakeLists.txt new file mode 100644 index 0000000..5c15ad7 --- /dev/null +++ b/launcher/tablet/CMakeLists.txt @@ -0,0 +1,13 @@ +set(HEADERS + include/tabletinterface.h) + +set(SRC + src/tabletinterface.cpp) + +add_library(astra_tablet STATIC ${HEADERS} ${SRC} qml/qml.qrc) +target_include_directories(astra_tablet PUBLIC include) +target_link_libraries(astra_tablet PUBLIC + astra_core + Qt5::Core + Qt5::Network + Qt5::Quick) \ No newline at end of file diff --git a/include/tabletinterface.h b/launcher/tablet/include/tabletinterface.h similarity index 100% rename from include/tabletinterface.h rename to launcher/tablet/include/tabletinterface.h diff --git a/qml/main.qml b/launcher/tablet/qml/main.qml similarity index 100% rename from qml/main.qml rename to launcher/tablet/qml/main.qml diff --git a/qml/qml.qrc b/launcher/tablet/qml/qml.qrc similarity index 100% rename from qml/qml.qrc rename to launcher/tablet/qml/qml.qrc diff --git a/src/tabletinterface.cpp b/launcher/tablet/src/tabletinterface.cpp similarity index 73% rename from src/tabletinterface.cpp rename to launcher/tablet/src/tabletinterface.cpp index 185c4db..838b8a1 100644 --- a/src/tabletinterface.cpp +++ b/launcher/tablet/src/tabletinterface.cpp @@ -1,4 +1,4 @@ -#include "tabletinterface.h" +#include "../launcher/tablet/include/tabletinterface.h" TabletInterface::TabletInterface(LauncherCore &core) { applicationEngine = new QQmlApplicationEngine();