diff --git a/CMakeLists.txt b/CMakeLists.txt index e04853cc82..e628975342 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -356,10 +356,10 @@ set(GAME_INCLUDE_DIRS ${miniz_SOURCE_DIR}) # Interface target for mods and sub-projects to inherit game headers/defines -add_library(dusk_game_headers INTERFACE) -target_include_directories(dusk_game_headers INTERFACE ${GAME_INCLUDE_DIRS}) -target_compile_definitions(dusk_game_headers INTERFACE TARGET_PC=1) -target_link_libraries(dusk_game_headers INTERFACE TracyClient) +add_library(dusklight_game_headers INTERFACE) +target_include_directories(dusklight_game_headers INTERFACE ${GAME_INCLUDE_DIRS}) +target_compile_definitions(dusklight_game_headers INTERFACE TARGET_PC=1) +target_link_libraries(dusklight_game_headers INTERFACE TracyClient) find_package(Threads REQUIRED) set(GAME_LIBS aurora::core aurora::gx aurora::gd aurora::si aurora::vi aurora::pad aurora::mtx aurora::os aurora::dvd @@ -752,3 +752,5 @@ foreach (target IN LISTS BINARY_TARGETS) endif () endforeach () endforeach () + +add_subdirectory(tools/mod_test) \ No newline at end of file diff --git a/cmake/DuskModSDK.cmake b/cmake/DuskModSDK.cmake index 286725ae01..b76e578857 100644 --- a/cmake/DuskModSDK.cmake +++ b/cmake/DuskModSDK.cmake @@ -10,14 +10,14 @@ function(add_dusk_mod target_name) add_library(${target_name} SHARED ${ARG_SOURCES}) set_target_properties(${target_name} PROPERTIES PREFIX "" WINDOWS_EXPORT_ALL_SYMBOLS ON) target_compile_features(${target_name} PRIVATE cxx_std_20) - target_link_libraries(${target_name} PRIVATE dusk_game_headers) + target_link_libraries(${target_name} PRIVATE dusklight_game_headers) if(APPLE) target_link_options(${target_name} PRIVATE -undefined dynamic_lookup) elseif(UNIX) target_link_options(${target_name} PRIVATE -Wl,--allow-shlib-undefined) elseif(WIN32) - target_link_libraries(${target_name} PRIVATE dusk_game) + target_link_libraries(${target_name} PRIVATE dusklight_game) if(MSVC) target_link_options(${target_name} PRIVATE /INCREMENTAL:NO) set_target_properties(${target_name} PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL")