R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set default debugger parameters

Browse Source 
The debugger can now be immediately invoked on all runtime projects after generating the solution without having to set anything up.
This commit is contained in:
Kawe Mazidjatari 2023-06-24 15:46:56 +02:00
parent 0f5b171b67
commit 884decd090
7 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/cmake/Configure.cmake
View File

@ -8,6 +8,8 @@ macro( initial_setup )
set( ENGINE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/r5dev" CACHE PATH "Engine source directory" )
set( THIRDPARTY_SOURCE_DIR "${ENGINE_SOURCE_DIR}/thirdparty" CACHE PATH "Thirdparty source directory" )
set( BUILD_OUTPUT_DIR "game" CACHE PATH "Build output directory" )
set( GLOBAL_PCH
"${ENGINE_SOURCE_DIR}/core/stdafx.h"
) # Global precompiled header shared among all libraries

2
r5dev/cmake/Macros.cmake
View File

@ -37,7 +37,7 @@ macro( end_sources )
if( NOT "${ARGN}" STREQUAL "" ) # Check if an output directory is passed
set_target_output_dirs( ${PROJECT_NAME} ${ARGN} )
else()
set_target_output_dirs( ${PROJECT_NAME} "game/" )
set_target_output_dirs( ${PROJECT_NAME} "${BUILD_OUTPUT_DIR}/" )
endif()
endmacro()

17
r5dev/core/CMakeLists.txt
View File

@ -115,7 +115,7 @@ target_compile_definitions( ${PROJECT_NAME} PRIVATE
"DEDICATED"
)
elseif( ${PROJECT_NAME} STREQUAL "client" )
end_sources( "game/bin/x64_retail/" )
end_sources( "${BUILD_OUTPUT_DIR}/bin/x64_retail/" )
target_compile_definitions( ${PROJECT_NAME} PRIVATE
"CLIENT_DLL"
)
@ -129,6 +129,21 @@ add_custom_command( TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -P ${ENGINE_SOURCE_DIR}/cmake/PostBuild.cmake
)
if( NOT ${PROJECT_NAME} STREQUAL "dedicated" )
set_target_properties( ${PROJECT_NAME} PROPERTIES
VS_DEBUGGER_COMMAND "r5apex.exe"
)
else()
set_target_properties( ${PROJECT_NAME} PROPERTIES
VS_DEBUGGER_COMMAND "r5apex_ds.exe"
)
endif()
set_target_properties( ${PROJECT_NAME} PROPERTIES
VS_DEBUGGER_COMMAND_ARGUMENTS "-wconsole -ansicolor -dev -devsdk"
VS_DEBUGGER_WORKING_DIRECTORY "$(ProjectDir)../../../${BUILD_OUTPUT_DIR}/"
)
endmacro()
add_sdk_project( "gamesdk" )

7
r5dev/naveditor/CMakeLists.txt
View File

@ -85,9 +85,14 @@ add_sources( SOURCE_GROUP "Utils/Include"
"include/ValueHistory.h"
)
end_sources( "game/bin/" )
end_sources( "${BUILD_OUTPUT_DIR}/bin/" )
whole_program_optimization()
set_target_properties( ${PROJECT_NAME} PROPERTIES
VS_DEBUGGER_COMMAND "naveditor.exe"
VS_DEBUGGER_COMMAND_ARGUMENTS "-console"
VS_DEBUGGER_WORKING_DIRECTORY "$(ProjectDir)../../../${BUILD_OUTPUT_DIR}/bin/"
)
target_compile_definitions( ${PROJECT_NAME} PRIVATE
"WIN32"
)

11
r5dev/netconsole/CMakeLists.txt
View File

@ -29,11 +29,16 @@ add_sources( SOURCE_GROUP "Windows"
"${ENGINE_SOURCE_DIR}/windows/console.h"
)
end_sources( "game/bin/" )
end_sources( "${BUILD_OUTPUT_DIR}/bin/" )
set_target_properties( ${PROJECT_NAME} PROPERTIES OUTPUT_NAME
"netcon32"
)
set_target_properties( ${PROJECT_NAME} PROPERTIES
VS_DEBUGGER_COMMAND "netcon32.exe"
VS_DEBUGGER_COMMAND_ARGUMENTS "-ansicolor"
VS_DEBUGGER_WORKING_DIRECTORY "$(ProjectDir)../../../${BUILD_OUTPUT_DIR}/bin/"
)
target_compile_definitions( ${PROJECT_NAME} PRIVATE
"NETCONSOLE"
)
@ -43,8 +48,8 @@ target_link_libraries( ${PROJECT_NAME} PRIVATE
"tier2"
"libprotobuf"
"libspdlog"
"SV_RCon_PB"
"CL_RCon_PB"
"SV_RCon_Pb"
"CL_RCon_Pb"
"Rpcrt4.lib"
"ws2_32.lib"
)

2
r5dev/pluginsdk/CMakeLists.txt
View File

@ -10,7 +10,7 @@ add_sources( SOURCE_GROUP "Core"
"pluginsdk.h"
)
end_sources( "game/bin/x64_retail/plugins/" )
end_sources( "${BUILD_OUTPUT_DIR}/bin/x64_retail/plugins/" )
target_link_libraries( ${PROJECT_NAME} PRIVATE
"tier0"

9
r5dev/sdklauncher/CMakeLists.txt
View File

@ -21,8 +21,13 @@ add_sources( SOURCE_GROUP "Resource"
end_sources()
set_target_properties( ${PROJECT_NAME} PROPERTIES OUTPUT_NAME "launcher" )
set_target_properties( ${PROJECT_NAME} PROPERTIES OUTPUT_NAME
"launcher"
)
set_target_properties( ${PROJECT_NAME} PROPERTIES
VS_DEBUGGER_COMMAND "launcher.exe"
VS_DEBUGGER_WORKING_DIRECTORY "$(ProjectDir)../../../${BUILD_OUTPUT_DIR}/bin/"
)
target_compile_definitions( ${PROJECT_NAME} PRIVATE
"SDKLAUNCHER"
)