Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cmake_fields
This commit is contained in:
commit
b4ecb38ae5
5 changed files with 21 additions and 14 deletions
|
@ -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@";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue