Skip to content

Commit

Permalink
馃摑 Fixed ZLib shit
Browse files Browse the repository at this point in the history
  • Loading branch information
@Lygaen
Lygaen committed Jan 29, 2024
1 parent 180118c commit 72a67a1
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion libs/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ add_subdirectory(rapidjson/)

add_subdirectory(zlib/)

# Fixing ZLib shit because we are doing a submodule install, and it is annoying to
# have a dirty git tree just because of one file
file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zlib/zconf.h.included ${CMAKE_CURRENT_SOURCE_DIR}/zlib/zconf.h)

add_subdirectory(openssl/)

set(BUILD_STATIC_LIBS ON CACHE BOOL "" FORCE)
Expand All @@ -24,5 +28,5 @@ set(LUABRIDGE_TESTING ON CACHE BOOL "" FORCE)
add_subdirectory(LuaBridge3/)

target_link_libraries(mineserver-libs PUBLIC crypto ssl zlibstatic lua::lib LuaBridge)
target_include_directories(mineserver-libs PUBLIC rapidjson/include zlib)
target_include_directories(mineserver-libs PUBLIC rapidjson/include zlibstatic)
target_compile_options(mineserver-libs PUBLIC -w)

0 comments on commit 72a67a1

Please sign in to comment.