diff options
| author | Petr Mrázek <peterix@gmail.com> | 2021-11-23 01:37:13 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2021-11-23 01:37:13 +0100 |
| commit | a522cad6d605323796c24634f741f45f17ddac21 (patch) | |
| tree | 5ffdfb9c3b5d9f87fe92419d98a53c628db7e343 | |
| parent | b49987e8767b4d0076d62033b019507a8cbc801c (diff) | |
| download | PrismLauncher-a522cad6d605323796c24634f741f45f17ddac21.tar.gz PrismLauncher-a522cad6d605323796c24634f741f45f17ddac21.tar.bz2 PrismLauncher-a522cad6d605323796c24634f741f45f17ddac21.zip | |
NOISSUE also undo the AUTORCC change because it was also broken
It broke 32bit linux builds...
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | launcher/CMakeLists.txt | 16 |
2 files changed, 15 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 88beec0b..0cf93758 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,6 @@ endif() ##################################### Set CMake options ##################################### set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/") diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 5a01870d..08c878d1 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -871,13 +871,27 @@ qt5_wrap_ui(LAUNCHER_UI ui/dialogs/EditAccountDialog.ui ) +qt5_add_resources(LAUNCHER_RESOURCES + resources/backgrounds/backgrounds.qrc + resources/multimc/multimc.qrc + resources/pe_dark/pe_dark.qrc + resources/pe_light/pe_light.qrc + resources/pe_colored/pe_colored.qrc + resources/pe_blue/pe_blue.qrc + resources/OSX/OSX.qrc + resources/iOS/iOS.qrc + resources/flat/flat.qrc + resources/documents/documents.qrc + ../${Launcher_Branding_LogoQRC} +) + ######## Windows resource files ######## if(WIN32) set(LAUNCHER_RCS ../${Launcher_Branding_WindowsRC}) endif() # Add executable -add_library(Launcher_logic STATIC ${LOGIC_SOURCES} ${LAUNCHER_SOURCES} ${LAUNCHER_UI}) +add_library(Launcher_logic STATIC ${LOGIC_SOURCES} ${LAUNCHER_SOURCES} ${LAUNCHER_UI} ${LAUNCHER_RESOURCES}) target_link_libraries(Launcher_logic systeminfo Launcher_quazip |