World, had to swap out zlib-ng for now because it wasn't playing nicely along side the zlib install. May revisit.

This commit is contained in:
KimLS 2025-11-16 22:43:58 -08:00
parent b9f8d7c3b1
commit 897512a43e
3 changed files with 4 additions and 4 deletions

View File

@ -86,7 +86,7 @@ find_package(unofficial-libmariadb CONFIG REQUIRED)
find_package(libuv CONFIG REQUIRED)
find_package(OpenSSL REQUIRED)
find_package(recastnavigation CONFIG REQUIRED)
find_package(zlib-ng CONFIG REQUIRED)
find_package(ZLIB REQUIRED)
pkg_check_modules(luajit REQUIRED luajit)
find_package(PerlLibs)
@ -298,7 +298,7 @@ ENDIF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS OR EQEMU_BUIL
IF(EQEMU_BUILD_SERVER)
ADD_SUBDIRECTORY(shared_memory)
# ADD_SUBDIRECTORY(world)
ADD_SUBDIRECTORY(world)
# ADD_SUBDIRECTORY(zone)
# ADD_SUBDIRECTORY(ucs)
# ADD_SUBDIRECTORY(queryserv)

View File

@ -835,7 +835,7 @@ INCLUDE_DIRECTORIES(Patches SocketLib StackWalker)
ADD_LIBRARY(common ${common_sources} ${common_headers} ${repositories})
target_link_libraries(common PUBLIC cereal::cereal fmt::fmt unofficial::libmariadb $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv> zlib-ng::zlib OpenSSL::SSL OpenSSL::Crypto)
target_link_libraries(common PUBLIC cereal::cereal fmt::fmt unofficial::libmariadb $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv> OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB)
IF (UNIX)
SET_SOURCE_FILES_PROPERTIES("SocketLib/Mime.cpp" PROPERTY COMPILE_FLAGS -Wno-unused-result)

View File

@ -6,7 +6,7 @@
"boost-foreach",
"boost-tuple",
"libmariadb",
"zlib-ng",
"zlib",
"openssl",
"luajit",
"cereal",