aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2021-10-13 21:43:42 +0200
committerPetr Mrázek <peterix@gmail.com>2021-10-21 00:47:53 +0200
commite12a7698005ea6c8da5ed8deb66993d628ab1a1f (patch)
tree7e8bbc305eec6b3ef109968998f239b7a1ba2a4c
parentf39c313c5fa1b7a76e3d28219310a471cc5114e7 (diff)
downloadPrismLauncher-e12a7698005ea6c8da5ed8deb66993d628ab1a1f.tar.gz
PrismLauncher-e12a7698005ea6c8da5ed8deb66993d628ab1a1f.tar.bz2
PrismLauncher-e12a7698005ea6c8da5ed8deb66993d628ab1a1f.zip
NOISSUE fix windows rc file and mac icon
-rw-r--r--launcher/CMakeLists.txt2
-rw-r--r--notsecrets/CMakeLists.txt3
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)