mirror of
https://github.com/SWG-Source/src.git
synced 2026-08-01 01:16:03 -04:00
Merge branch 'testing' into clang-profile-build
This commit is contained in:
@@ -81,7 +81,3 @@ target_link_libraries(LogServer
|
||||
${CURL_LIBRARIES}
|
||||
${CMAKE_DL_LIBS}
|
||||
)
|
||||
|
||||
if(${BUILD_MULODI_LIB})
|
||||
target_link_libraries(LogServer mulodi)
|
||||
endif()
|
||||
|
||||
@@ -786,10 +786,6 @@ add_library(serverGame STATIC
|
||||
${CMAKE_CURRENT_BINARY_DIR}/shared/generated/Packager.cpp
|
||||
)
|
||||
|
||||
if(NOT WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
target_link_libraries(mulodi)
|
||||
endif()
|
||||
|
||||
target_link_libraries(serverGame
|
||||
sharedCommandParser
|
||||
sharedPathfinding
|
||||
@@ -797,6 +793,3 @@ target_link_libraries(serverGame
|
||||
sharedTerrain
|
||||
)
|
||||
|
||||
if(${BUILD_MULODI_LIB})
|
||||
target_link_libraries(serverGame mulodi)
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user