Fix zlib/zstd linking, add MinGW .a fallback libs

This commit is contained in:
Zero
2026-06-12 14:40:37 +02:00
parent db621e41ef
commit d33ac0e45e
4 changed files with 8 additions and 8 deletions

View File

@@ -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
>
$<$<NOT:$<CONFIG:Debug>>:
# 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
>
$<$<NOT:$<BOOL:${MSVC}>>:z>
$<$<NOT:$<BOOL:${MSVC}>>:zstd>
$<$<NOT:$<BOOL:${MSVC}>>:${CMAKE_CURRENT_SOURCE_DIR}/Common/Libs/zlib/libs/libz.a>
$<$<NOT:$<BOOL:${MSVC}>>:${CMAKE_CURRENT_SOURCE_DIR}/Windows64/Libs/zstd/libs/libzstd.a>
$<$<NOT:$<BOOL:${MSVC}>>:-Wl,--end-group>
)

Binary file not shown.

Binary file not shown.