mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2025-08-06 10:44:08 +00:00
fix: Dissolve more CMake dependencies (#1387)
* fix: more include changes * fix: remove dZoneManager from global include * fix: dDatabase * fix: dCommon * fix: object libs * fix: rebase * fix: bcrypt * wip: try simplified connector build * fix: update dockerfile * fix: mariadb C/C++ on apple * feat: Move scripts to CMAKE_MODULE_PATH * fix: dPropertyBehaviors * fix: macos? * fix: Dockerfile * fix: macos? * fix: macos? * fix: macos? * fix: macos? * fix: macos? * try: install_name_tool * fix not building on unix * fix include paths * Remove code changes Will fix in another PR. * format pass remove 2 more included directories. remove commented out code add status to messages * comments and format surround include directories with quotes remove commented out code remove debug messages * Update CMakeLists.txt --------- Co-authored-by: David Markowitz <EmosewaMC@gmail.com> Co-authored-by: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>
This commit is contained in:
@@ -30,15 +30,28 @@ endforeach()
|
||||
|
||||
add_subdirectory(Pets)
|
||||
|
||||
add_library(dScriptsServer STATIC ${DSCRIPTS_SOURCES_02_SERVER})
|
||||
target_include_directories(dScriptsServer PUBLIC "."
|
||||
add_library(dScriptsServerBase OBJECT ${DSCRIPTS_SOURCES_02_SERVER})
|
||||
target_include_directories(dScriptsServerBase PUBLIC "."
|
||||
"DLU"
|
||||
"Equipment"
|
||||
"Minigame"
|
||||
"Minigame/General"
|
||||
"Objects"
|
||||
"Pets")
|
||||
)
|
||||
target_precompile_headers(dScriptsServerBase REUSE_FROM dScriptsBase)
|
||||
|
||||
add_library(dScriptsServer INTERFACE)
|
||||
target_sources(dScriptsServer INTERFACE
|
||||
$<TARGET_OBJECTS:dScriptsServerBase>
|
||||
$<TARGET_OBJECTS:dScriptsServerEnemy>
|
||||
$<TARGET_OBJECTS:dScriptsServerPets>
|
||||
)
|
||||
target_link_libraries(dScriptsServer INTERFACE
|
||||
dScriptsServerEnemy
|
||||
dScriptsServerMap)
|
||||
target_precompile_headers(dScriptsServer REUSE_FROM dScriptsBase)
|
||||
dScriptsServerMap
|
||||
)
|
||||
target_include_directories(dScriptsServer INTERFACE
|
||||
$<TARGET_PROPERTY:dScriptsServerBase,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:dScriptsServerEnemy,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:dScriptsServerMap,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:dScriptsServerPets,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
)
|
||||
|
Reference in New Issue
Block a user