Merge branch 'develop' into feat/launcher-updater

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-30 11:47:33 +01:00
parent 1faf741004 b83fdbd1b7
commit befa3baa6a
115 changed files with 1296 additions and 793 deletions
--- a/buildconfig/BuildConfig.cpp.in
+++ b/buildconfig/BuildConfig.cpp.in
@ -118,6 +118,9 @@ Config::Config()
    FLAME_API_KEY = "@Launcher_CURSEFORGE_API_KEY@";
    META_URL = "@Launcher_META_URL@";

+    GLFW_LIBRARY_NAME = "@Launcher_GLFW_LIBRARY_NAME@";
+    OPENAL_LIBRARY_NAME = "@Launcher_OPENAL_LIBRARY_NAME@";
+
    BUG_TRACKER_URL = "@Launcher_BUG_TRACKER_URL@";
    TRANSLATIONS_URL = "@Launcher_TRANSLATIONS_URL@";
    MATRIX_URL = "@Launcher_MATRIX_URL@";