From b57eb0c0c33d89c28812e6113f52d1dfc73e1bcd Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Sun, 14 May 2023 01:27:51 +0200 Subject: [PATCH] Set runtime directories for projects Adjust the runtime directories, so they are identical to pre-cmake port. --- r5dev/core/CMakeLists.txt | 13 +++++-------- r5dev/naveditor/CMakeLists.txt | 2 +- r5dev/netconsole/CMakeLists.txt | 4 ++-- r5dev/pluginsdk/CMakeLists.txt | 2 +- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/r5dev/core/CMakeLists.txt b/r5dev/core/CMakeLists.txt index 3ac7e2da..1c1c9100 100644 --- a/r5dev/core/CMakeLists.txt +++ b/r5dev/core/CMakeLists.txt @@ -63,6 +63,8 @@ target_link_libraries( ${PROJECT_NAME} PRIVATE "libcurl" "libprotobuf" "libspdlog" + "libdetour" + "navdebugutils" "networksystem" "pluginsystem" @@ -75,12 +77,6 @@ target_link_libraries( ${PROJECT_NAME} PRIVATE "vscript" "game" ) -if( NOT ${PROJECT_NAME} STREQUAL "client" ) -target_link_libraries( ${PROJECT_NAME} PRIVATE - "navdebugutils" - "libdetour" -) -endif() if( NOT ${PROJECT_NAME} STREQUAL "dedicated" ) target_link_libraries( ${PROJECT_NAME} PRIVATE @@ -103,17 +99,18 @@ target_link_libraries( ${PROJECT_NAME} PRIVATE ) endif() -end_sources() - if( ${PROJECT_NAME} STREQUAL "gamesdk" ) +end_sources() target_compile_definitions( ${PROJECT_NAME} PRIVATE "GAMESDK" ) elseif( ${PROJECT_NAME} STREQUAL "dedicated" ) +end_sources() target_compile_definitions( ${PROJECT_NAME} PRIVATE "DEDICATED" ) elseif( ${PROJECT_NAME} STREQUAL "client" ) +end_sources( "game/bin/x64_retail/" ) target_compile_definitions( ${PROJECT_NAME} PRIVATE "CLIENT_DLL" ) diff --git a/r5dev/naveditor/CMakeLists.txt b/r5dev/naveditor/CMakeLists.txt index 60e1cccb..df21ca65 100644 --- a/r5dev/naveditor/CMakeLists.txt +++ b/r5dev/naveditor/CMakeLists.txt @@ -85,7 +85,7 @@ add_sources( SOURCE_GROUP "Utils/Include" "include/ValueHistory.h" ) -end_sources() +end_sources( "game/bin/" ) whole_program_optimization() target_compile_definitions( ${PROJECT_NAME} PRIVATE diff --git a/r5dev/netconsole/CMakeLists.txt b/r5dev/netconsole/CMakeLists.txt index 8712320d..0856e0df 100644 --- a/r5dev/netconsole/CMakeLists.txt +++ b/r5dev/netconsole/CMakeLists.txt @@ -26,10 +26,10 @@ add_sources( SOURCE_GROUP "Engine" add_sources( SOURCE_GROUP "Windows" "${ENGINE_SOURCE_DIR}/windows/console.cpp" - "${ENGINE_SOURCE_DIR}/Windows/console.h" + "${ENGINE_SOURCE_DIR}/windows/console.h" ) -end_sources() +end_sources( "game/bin/" ) set_target_properties( ${PROJECT_NAME} PROPERTIES OUTPUT_NAME "netcon32" diff --git a/r5dev/pluginsdk/CMakeLists.txt b/r5dev/pluginsdk/CMakeLists.txt index ae53bdd0..818c951f 100644 --- a/r5dev/pluginsdk/CMakeLists.txt +++ b/r5dev/pluginsdk/CMakeLists.txt @@ -10,7 +10,7 @@ add_sources( SOURCE_GROUP "Core" "pluginsdk.h" ) -end_sources() +end_sources( "game/bin/x64_retail/plugins/" ) target_link_libraries( ${PROJECT_NAME} PRIVATE "tier0"