Merge branch 'update-quazip' of git://github.com/Scrumplex/PolyMC into develop

2022-02-03 14:14:12 -05:00
parent 2c62a34c2f c4cb7ddc4f
commit 076efc4cb2
19 changed files with 167 additions and 42 deletions
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@ -931,7 +931,6 @@ endif()
 add_library(Launcher_logic STATIC ${LOGIC_SOURCES} ${LAUNCHER_SOURCES} ${LAUNCHER_UI} ${LAUNCHER_RESOURCES})
 target_link_libraries(Launcher_logic
    systeminfo
-    Launcher_quazip
    Launcher_classparser
    ${NBT_NAME}
    ${ZLIB_LIBRARIES}
@ -949,7 +948,7 @@ target_link_libraries(Launcher_logic
 )
 target_link_libraries(Launcher_logic
    Launcher_iconfix
-    ${QUAZIP_LIBRARIES}
+    QuaZip::QuaZip
    hoedown
    Launcher_rainbow
    LocalPeer