mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-13 14:41:28 +00:00
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:
parent
b9f8d7c3b1
commit
897512a43e
@ -86,7 +86,7 @@ find_package(unofficial-libmariadb CONFIG REQUIRED)
|
|||||||
find_package(libuv CONFIG REQUIRED)
|
find_package(libuv CONFIG REQUIRED)
|
||||||
find_package(OpenSSL REQUIRED)
|
find_package(OpenSSL REQUIRED)
|
||||||
find_package(recastnavigation CONFIG REQUIRED)
|
find_package(recastnavigation CONFIG REQUIRED)
|
||||||
find_package(zlib-ng CONFIG REQUIRED)
|
find_package(ZLIB REQUIRED)
|
||||||
pkg_check_modules(luajit REQUIRED luajit)
|
pkg_check_modules(luajit REQUIRED luajit)
|
||||||
find_package(PerlLibs)
|
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)
|
IF(EQEMU_BUILD_SERVER)
|
||||||
ADD_SUBDIRECTORY(shared_memory)
|
ADD_SUBDIRECTORY(shared_memory)
|
||||||
# ADD_SUBDIRECTORY(world)
|
ADD_SUBDIRECTORY(world)
|
||||||
# ADD_SUBDIRECTORY(zone)
|
# ADD_SUBDIRECTORY(zone)
|
||||||
# ADD_SUBDIRECTORY(ucs)
|
# ADD_SUBDIRECTORY(ucs)
|
||||||
# ADD_SUBDIRECTORY(queryserv)
|
# ADD_SUBDIRECTORY(queryserv)
|
||||||
|
|||||||
@ -835,7 +835,7 @@ INCLUDE_DIRECTORIES(Patches SocketLib StackWalker)
|
|||||||
|
|
||||||
ADD_LIBRARY(common ${common_sources} ${common_headers} ${repositories})
|
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)
|
IF (UNIX)
|
||||||
SET_SOURCE_FILES_PROPERTIES("SocketLib/Mime.cpp" PROPERTY COMPILE_FLAGS -Wno-unused-result)
|
SET_SOURCE_FILES_PROPERTIES("SocketLib/Mime.cpp" PROPERTY COMPILE_FLAGS -Wno-unused-result)
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
"boost-foreach",
|
"boost-foreach",
|
||||||
"boost-tuple",
|
"boost-tuple",
|
||||||
"libmariadb",
|
"libmariadb",
|
||||||
"zlib-ng",
|
"zlib",
|
||||||
"openssl",
|
"openssl",
|
||||||
"luajit",
|
"luajit",
|
||||||
"cereal",
|
"cereal",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user