celisej567/mcpe
1
0
Fork 0
mirror of https://github.com/celisej567/mcpe.git synced 2026-09-23 20:09:46 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Make ZLib A Submodule"

Browse Source 
This reverts commit 26b94524a9.
This commit is contained in:
iProgramInCpp
2023-11-03 03:14:06 +02:00
parent 0432b9d5f7
commit f0dc1fff5c
31 changed files with 23310 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/CMakeLists.txt
View File

@@ -233,21 +233,15 @@ add_library(reminecraftpe-core STATIC
world/tile/DoorTile.cpp
renderer/GL/GL.cpp
)
target_include_directories(reminecraftpe-core PUBLIC . ..)
target_include_directories(reminecraftpe-core PUBLIC . .. ../thirdparty/zlib)
# RakNet
add_subdirectory(../thirdparty/raknet raknet)
target_link_libraries(reminecraftpe-core PUBLIC raknet)
# zlib
find_package(ZLIB)
if(ZLIB_FOUND)
target_link_libraries(reminecraftpe-core PUBLIC ZLIB::ZLIB)
else()
add_subdirectory(../thirdparty/zlib zlib EXCLUDE_FROM_ALL)
target_link_libraries(reminecraftpe-core PUBLIC zlibstatic)
target_include_directories(reminecraftpe-core PUBLIC ../thirdparty/zlib "${CMAKE_CURRENT_BINARY_DIR}/zlib")
endif()
add_subdirectory(../thirdparty/zlib zlib)
target_link_libraries(reminecraftpe-core PUBLIC zlib)
# SDL
add_library(SDL INTERFACE)