diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e3022ac9..88beec0bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,6 @@ endif() ##################################### Set CMake options ##################################### set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 601f3b117..5a01870d9 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -824,13 +824,60 @@ SET(LAUNCHER_SOURCES ui/instanceview/VisualGroup.h ) +qt5_wrap_ui(LAUNCHER_UI + ui/pages/global/AccountListPage.ui + ui/pages/global/JavaPage.ui + ui/pages/global/LauncherPage.ui + ui/pages/global/PasteEEPage.ui + ui/pages/global/ProxyPage.ui + ui/pages/global/MinecraftPage.ui + ui/pages/global/ExternalToolsPage.ui + ui/pages/instance/ModFolderPage.ui + ui/pages/instance/NotesPage.ui + ui/pages/instance/LogPage.ui + ui/pages/instance/ServersPage.ui + ui/pages/instance/GameOptionsPage.ui + ui/pages/instance/OtherLogsPage.ui + ui/pages/instance/InstanceSettingsPage.ui + ui/pages/instance/VersionPage.ui + ui/pages/instance/WorldListPage.ui + ui/pages/instance/LegacyUpgradePage.ui + ui/pages/instance/ScreenshotsPage.ui + ui/pages/modplatform/atlauncher/AtlOptionalModDialog.ui + ui/pages/modplatform/atlauncher/AtlPage.ui + ui/pages/modplatform/VanillaPage.ui + ui/pages/modplatform/flame/FlamePage.ui + ui/pages/modplatform/legacy_ftb/Page.ui + ui/pages/modplatform/ImportPage.ui + ui/pages/modplatform/ftb/FtbPage.ui + ui/pages/modplatform/technic/TechnicPage.ui + ui/widgets/InstanceCardWidget.ui + ui/widgets/CustomCommands.ui + ui/widgets/MCModInfoFrame.ui + ui/dialogs/CopyInstanceDialog.ui + ui/dialogs/ProfileSetupDialog.ui + ui/dialogs/ProgressDialog.ui + ui/dialogs/NewInstanceDialog.ui + ui/dialogs/NotificationDialog.ui + ui/dialogs/UpdateDialog.ui + ui/dialogs/NewComponentDialog.ui + ui/dialogs/ProfileSelectDialog.ui + ui/dialogs/SkinUploadDialog.ui + ui/dialogs/ExportInstanceDialog.ui + ui/dialogs/IconPickerDialog.ui + ui/dialogs/MSALoginDialog.ui + ui/dialogs/AboutDialog.ui + ui/dialogs/LoginDialog.ui + ui/dialogs/EditAccountDialog.ui +) + ######## Windows resource files ######## if(WIN32) set(LAUNCHER_RCS ../${Launcher_Branding_WindowsRC}) endif() # Add executable -add_library(Launcher_logic STATIC ${LOGIC_SOURCES} ${LAUNCHER_SOURCES}) +add_library(Launcher_logic STATIC ${LOGIC_SOURCES} ${LAUNCHER_SOURCES} ${LAUNCHER_UI}) target_link_libraries(Launcher_logic systeminfo Launcher_quazip