Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-12-22 21:43:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

try to fix CI failures on Windows and MacOS

Browse Source
This commit is contained in:
jadebenn 2024-12-17 01:10:17 -06:00
parent 82f510c642
commit 93dcfddac5
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dGame/dBehaviors/CMakeLists.txt
View File

@ -55,7 +55,7 @@ set(DGAME_DBEHAVIORS_SOURCES "AirMovementBehavior.cpp"
"VerifyBehavior.cpp") "VerifyBehavior.cpp")
add_library(dBehaviors OBJECT ${DGAME_DBEHAVIORS_SOURCES}) add_library(dBehaviors OBJECT ${DGAME_DBEHAVIORS_SOURCES})
target_link_libraries(dBehaviors PUBLIC dDatabaseCDClient dPhysics magic_enum::magic_enum tinyxml2) target_link_libraries(dBehaviors PUBLIC dDatabaseCDClient dPhysics magic_enum::magic_enum)
target_include_directories(dBehaviors PUBLIC "." target_include_directories(dBehaviors PUBLIC "."
"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # via BehaviorContext.h "${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # via BehaviorContext.h
PRIVATE PRIVATE

2
dGame/dComponents/CMakeLists.txt
View File

@ -79,4 +79,4 @@ target_include_directories(dComponents PUBLIC "."
) )
target_precompile_headers(dComponents REUSE_FROM dGameBase) target_precompile_headers(dComponents REUSE_FROM dGameBase)
target_link_libraries(dComponents PUBLIC magic_enum::magic_enum tinyxml2 INTERFACE dBehaviors) target_link_libraries(dComponents PUBLIC magic_enum::magic_enum INTERFACE dBehaviors)

2
dGame/dGameMessages/CMakeLists.txt
View File

@ -6,7 +6,7 @@ set(DGAME_DGAMEMESSAGES_SOURCES
add_library(dGameMessages OBJECT ${DGAME_DGAMEMESSAGES_SOURCES}) add_library(dGameMessages OBJECT ${DGAME_DGAMEMESSAGES_SOURCES})
target_link_libraries(dGameMessages target_link_libraries(dGameMessages
PUBLIC magic_enum::magic_enum tinyxml2 dDatabase PUBLIC magic_enum::magic_enum dDatabase
INTERFACE dGameBase # TradingManager INTERFACE dGameBase # TradingManager
) )
target_include_directories(dGameMessages PUBLIC "." target_include_directories(dGameMessages PUBLIC "."

2
dGame/dInventory/CMakeLists.txt
View File

@ -24,7 +24,7 @@ target_include_directories(dInventory PUBLIC "."
"${PROJECT_SOURCE_DIR}/dGame/dMission" # via MissionComponent.h "${PROJECT_SOURCE_DIR}/dGame/dMission" # via MissionComponent.h
"${PROJECT_SOURCE_DIR}/dZoneManager" # via Item.cpp "${PROJECT_SOURCE_DIR}/dZoneManager" # via Item.cpp
) )
target_link_libraries(dInventory PUBLIC magic_enum::magic_enum tinyxml2) target_link_libraries(dInventory PUBLIC magic_enum::magic_enum)
target_precompile_headers(dInventory REUSE_FROM dGameBase) target_precompile_headers(dInventory REUSE_FROM dGameBase)
# Workaround for compiler bug where the optimized code could result in a memcpy of 0 bytes, even though that isnt possible. # Workaround for compiler bug where the optimized code could result in a memcpy of 0 bytes, even though that isnt possible.
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=97185 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=97185

2
tests/dECSTests/TestECS.cpp
View File

@ -1,4 +1,4 @@
#include <cstdio> #include <optional>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "Core.h" #include "Core.h"
#include <dComponents/Component.h> #include <dComponents/Component.h>