diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-07-02 12:50:45 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-07-02 12:50:45 +0300 |
| commit | 6c4cf085e028a76dd6c0fb4d9649783b3d97aefd (patch) | |
| tree | 859e8a0a8a5fb44fc58c1c18130bad6b9c723e46 /launcher/CMakeLists.txt | |
| parent | 87155e346c33288fccb68c3b9029a11b658395b2 (diff) | |
| parent | b51f1f1d41a6153c37b1d61a04df8ece5004cc27 (diff) | |
| download | PrismLauncher-6c4cf085e028a76dd6c0fb4d9649783b3d97aefd.tar.gz PrismLauncher-6c4cf085e028a76dd6c0fb4d9649783b3d97aefd.tar.bz2 PrismLauncher-6c4cf085e028a76dd6c0fb4d9649783b3d97aefd.zip | |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
Diffstat (limited to 'launcher/CMakeLists.txt')
| -rw-r--r-- | launcher/CMakeLists.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 97620401..af3bc28e 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -377,8 +377,6 @@ set(MINECRAFT_SOURCES minecraft/services/SkinDelete.cpp minecraft/services/SkinDelete.h - mojang/PackageManifest.h - mojang/PackageManifest.cpp minecraft/Agent.h) # the screenshots feature @@ -686,6 +684,7 @@ SET(LAUNCHER_SOURCES VersionProxyModel.h VersionProxyModel.cpp Markdown.h + Markdown.cpp # Super secret! KonamiCode.h @@ -829,8 +828,8 @@ SET(LAUNCHER_SOURCES ui/pages/global/APIPage.h # GUI - platform pages - ui/pages/modplatform/VanillaPage.cpp - ui/pages/modplatform/VanillaPage.h + ui/pages/modplatform/CustomPage.cpp + ui/pages/modplatform/CustomPage.h ui/pages/modplatform/ResourcePage.cpp ui/pages/modplatform/ResourcePage.h @@ -1036,7 +1035,7 @@ qt_wrap_ui(LAUNCHER_UI ui/pages/instance/ScreenshotsPage.ui ui/pages/modplatform/atlauncher/AtlOptionalModDialog.ui ui/pages/modplatform/atlauncher/AtlPage.ui - ui/pages/modplatform/VanillaPage.ui + ui/pages/modplatform/CustomPage.ui ui/pages/modplatform/ResourcePage.ui ui/pages/modplatform/flame/FlamePage.ui ui/pages/modplatform/legacy_ftb/Page.ui |