Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cmake_fields

2024-09-16 20:06:18 +03:00
parent e53a5b3eca 914ae6ead6
commit b4ecb38ae5
5 changed files with 21 additions and 14 deletions
--- a/buildconfig/BuildConfig.cpp.in
+++ b/buildconfig/BuildConfig.cpp.in
@@ -81,8 +81,8 @@ Config::Config()
        UPDATER_ENABLED = true;
    }

-    #cmakedefine01 ENABLE_JAVA_DOWNLOADER
-    JAVA_DOWNLOADER_ENABLED = ENABLE_JAVA_DOWNLOADER;
+    #cmakedefine01 Launcher_ENABLE_JAVA_DOWNLOADER
+    JAVA_DOWNLOADER_ENABLED = Launcher_ENABLE_JAVA_DOWNLOADER;

    GIT_COMMIT = "@Launcher_GIT_COMMIT@";
    GIT_TAG = "@Launcher_GIT_TAG@";