LegacyConsole/GabsPuNs-Project_Zenith_Main
3
0
Fork 0
mirror of https://github.com/GabsPuNs/Project-Zenith-Main.git synced 2026-07-09 17:28:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
Minecraft.Client/CMakeLists.txt
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>
)

BIN
Minecraft.Client/Common/Libs/zlib/libs/libz.a Normal file
View File

Binary file not shown.

BIN
Minecraft.Client/Windows64/Libs/zstd/libs/libzstd.a Normal file
View File

Binary file not shown.

8
Minecraft.Server/CMakeLists.txt
View File

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