diff --git a/Minecraft.Client/CMakeLists.txt b/Minecraft.Client/CMakeLists.txt index 688243bd..13bd890a 100644 --- a/Minecraft.Client/CMakeLists.txt +++ b/Minecraft.Client/CMakeLists.txt @@ -129,7 +129,7 @@ target_link_libraries(Minecraft.Client PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/Windows64/Libs/4JLibs/libs/4J_Storage_d.lib" "${CMAKE_CURRENT_SOURCE_DIR}/Windows64/Libs/4JLibs/libs/4J_Render_PC_d.lib" # Debug ZLIB libraries - "${CMAKE_CURRENT_SOURCE_DIR}/Common/Libs/zlib/libs/zlibstatic.lib" + ${CMAKE_CURRENT_SOURCE_DIR}/Common/Libs/zlib/libs/zlibstatic.lib > $<$>: # Release Discord libraries @@ -141,10 +141,10 @@ target_link_libraries(Minecraft.Client PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/Windows64/Libs/4JLibs/libs/4J_Storage.lib" "${CMAKE_CURRENT_SOURCE_DIR}/Windows64/Libs/4JLibs/libs/4J_Render_PC.lib" # Release ZLIB libraries - "${CMAKE_CURRENT_SOURCE_DIR}/Common/Libs/zlib/libs/zlibstatic.lib" + ${CMAKE_CURRENT_SOURCE_DIR}/Common/Libs/zlib/libs/zlibstatic.lib > - $<$>:z> - $<$>:zstd> + $<$>:${CMAKE_CURRENT_SOURCE_DIR}/Common/Libs/zlib/libs/libz.a> + $<$>:${CMAKE_CURRENT_SOURCE_DIR}/Windows64/Libs/zstd/libs/libzstd.a> $<$>:-Wl,--end-group> ) diff --git a/Minecraft.Client/Common/Libs/zlib/libs/libz.a b/Minecraft.Client/Common/Libs/zlib/libs/libz.a new file mode 100644 index 00000000..0bc30164 Binary files /dev/null and b/Minecraft.Client/Common/Libs/zlib/libs/libz.a differ diff --git a/Minecraft.Client/Windows64/Libs/zstd/libs/libzstd.a b/Minecraft.Client/Windows64/Libs/zstd/libs/libzstd.a new file mode 100644 index 00000000..02735337 Binary files /dev/null and b/Minecraft.Client/Windows64/Libs/zstd/libs/libzstd.a differ diff --git a/Minecraft.Server/CMakeLists.txt b/Minecraft.Server/CMakeLists.txt index 141e1328..ad1f812f 100644 --- a/Minecraft.Server/CMakeLists.txt +++ b/Minecraft.Server/CMakeLists.txt @@ -63,7 +63,7 @@ target_link_libraries(Minecraft.Server PRIVATE "${CMAKE_SOURCE_DIR}/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Storage_d.lib" "${CMAKE_SOURCE_DIR}/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Render_PC_d.lib" # Debug ZLIB libraries - "${CMAKE_SOURCE_DIR}/Minecraft.Client/Common/Libs/zlib/libs/zlibstatic.lib" + ${CMAKE_SOURCE_DIR}/Minecraft.Client/Common/Libs/zlib/libs/zlibstatic.lib > $<$>: # Release Discord libraries @@ -73,10 +73,10 @@ target_link_libraries(Minecraft.Server PRIVATE "${CMAKE_SOURCE_DIR}/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Storage.lib" "${CMAKE_SOURCE_DIR}/Minecraft.Client/Windows64/Libs/4JLibs/libs/4J_Render_PC.lib" # Release ZLIB libraries - "${CMAKE_SOURCE_DIR}/Minecraft.Client/Common/Libs/zlib/libs/zlibstatic.lib" + ${CMAKE_SOURCE_DIR}/Minecraft.Client/Common/Libs/zlib/libs/zlibstatic.lib > - $<$>:z> - $<$>:zstd> + $<$>:${CMAKE_SOURCE_DIR}/Minecraft.Client/Common/Libs/zlib/libs/libz.a> + $<$>:${CMAKE_SOURCE_DIR}/Minecraft.Client/Windows64/Libs/zstd/libs/libzstd.a> $<$>:-Wl,--end-group> )