From e12a7698005ea6c8da5ed8deb66993d628ab1a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Wed, 13 Oct 2021 21:43:42 +0200 Subject: [PATCH] NOISSUE fix windows rc file and mac icon --- launcher/CMakeLists.txt | 2 +- notsecrets/CMakeLists.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index d1216f86..eb49b6d9 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -883,7 +883,7 @@ set(MULTIMC_QRCS ######## Windows resource files ######## if(WIN32) - set(MULTIMC_RCS resources/multimc.rc) + set(MULTIMC_RCS ../${Launcher_Branding_WindowsRC}) endif() # Qt 5 stuff diff --git a/notsecrets/CMakeLists.txt b/notsecrets/CMakeLists.txt index 88504a4d..63930672 100644 --- a/notsecrets/CMakeLists.txt +++ b/notsecrets/CMakeLists.txt @@ -6,4 +6,5 @@ target_include_directories(secrets PUBLIC .) set(Launcher_Name "Launcher" PARENT_SCOPE) set(Launcher_Copyright "MultiMC Contributors" PARENT_SCOPE) -set(Launcher_Branding_ICNS "notsecrets/Launcher.icns") +set(Launcher_Branding_ICNS "notsecrets/Launcher.icns" PARENT_SCOPE) +set(Launcher_Branding_WindowsRC "notsecrets/launcher.rc" PARENT_SCOPE)