From 6a86ae2606d0c69d07e5a5b4a6b05ad5db1f3670 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Sun, 14 May 2023 17:36:08 +0200 Subject: [PATCH] Cleanup CMakeLists files Light cleanup in CMakeLists files. Split protocols and improve filter names. --- r5dev/CMakeLists.txt | 4 ++- r5dev/core/CMakeLists.txt | 5 +++- r5dev/datacache/CMakeLists.txt | 2 +- r5dev/inputsystem/CMakeLists.txt | 2 +- r5dev/launcher/CMakeLists.txt | 2 +- r5dev/localize/CMakeLists.txt | 2 +- r5dev/materialsystem/CMakeLists.txt | 2 +- r5dev/netconsole/CMakeLists.txt | 3 ++- r5dev/networksystem/CMakeLists.txt | 5 +++- r5dev/pluginsdk/CMakeLists.txt | 4 ++- r5dev/pluginsystem/CMakeLists.txt | 7 ++++-- r5dev/protoc/CMakeLists.txt | 33 ++++++++++++++++++------- r5dev/thirdparty/detours/CMakeLists.txt | 5 +++- r5dev/tier0/CMakeLists.txt | 30 +++------------------- r5dev/tier1/CMakeLists.txt | 28 +++------------------ r5dev/tier2/CMakeLists.txt | 9 +++---- r5dev/vgui/CMakeLists.txt | 3 +++ r5dev/vscript/CMakeLists.txt | 18 +++++++++++--- r5dev/vstdlib/CMakeLists.txt | 2 +- 19 files changed, 84 insertions(+), 82 deletions(-) diff --git a/r5dev/CMakeLists.txt b/r5dev/CMakeLists.txt index cfc2ccd5..ba6c2a95 100644 --- a/r5dev/CMakeLists.txt +++ b/r5dev/CMakeLists.txt @@ -6,7 +6,6 @@ add_subdirectory( tier0 ) add_subdirectory( tier1 ) add_subdirectory( tier2 ) add_subdirectory( launcher ) -add_subdirectory( protoc ) add_subdirectory( appframework ) set( FOLDER_CONTEXT "Libraries" ) @@ -17,6 +16,9 @@ add_subdirectory( vphysics ) add_subdirectory( ebisusdk ) add_subdirectory( codecs ) +set( FOLDER_CONTEXT "Protocols" ) +add_subdirectory( protoc ) + set( FOLDER_CONTEXT "UI" ) add_subdirectory( vguimatsurface ) add_subdirectory( vgui ) diff --git a/r5dev/core/CMakeLists.txt b/r5dev/core/CMakeLists.txt index baa7b3b0..ee0f2eeb 100644 --- a/r5dev/core/CMakeLists.txt +++ b/r5dev/core/CMakeLists.txt @@ -51,9 +51,12 @@ target_link_libraries( ${PROJECT_NAME} PRIVATE "vstdlib" "vpklib" "mathlib" - "protocol_pb" "vphysics" + "SigCache_PB" + "SV_RCon_PB" + "CL_RCon_PB" + "rtech_tools" "rtech_game" "stryder" diff --git a/r5dev/datacache/CMakeLists.txt b/r5dev/datacache/CMakeLists.txt index b8a7ca34..426f869f 100644 --- a/r5dev/datacache/CMakeLists.txt +++ b/r5dev/datacache/CMakeLists.txt @@ -3,7 +3,7 @@ add_module( "lib" "datacache" "vpc" ${FOLDER_CONTEXT} ) start_sources() -add_sources( SOURCE_GROUP "Core" +add_sources( SOURCE_GROUP "Private" "mdlcache.cpp" "mdlcache.h" ) diff --git a/r5dev/inputsystem/CMakeLists.txt b/r5dev/inputsystem/CMakeLists.txt index b608b3e9..85ac6b9a 100644 --- a/r5dev/inputsystem/CMakeLists.txt +++ b/r5dev/inputsystem/CMakeLists.txt @@ -3,7 +3,7 @@ add_module( "lib" "inputsystem" "vpc" ${FOLDER_CONTEXT} ) start_sources() -add_sources( SOURCE_GROUP "Core" +add_sources( SOURCE_GROUP "Private" "inputsystem.cpp" "inputsystem.h" ) diff --git a/r5dev/launcher/CMakeLists.txt b/r5dev/launcher/CMakeLists.txt index 4eb77760..cb1af2dc 100644 --- a/r5dev/launcher/CMakeLists.txt +++ b/r5dev/launcher/CMakeLists.txt @@ -3,7 +3,7 @@ add_module( "lib" "launcher" "vpc" ${FOLDER_CONTEXT} ) start_sources() -add_sources( SOURCE_GROUP "Core" +add_sources( SOURCE_GROUP "Runtime" "launcher.cpp" "launcher.h" "launcherdefs.h" diff --git a/r5dev/localize/CMakeLists.txt b/r5dev/localize/CMakeLists.txt index b18d30f6..d3e5ffb9 100644 --- a/r5dev/localize/CMakeLists.txt +++ b/r5dev/localize/CMakeLists.txt @@ -3,7 +3,7 @@ add_module( "lib" "localize" "vpc" ${FOLDER_CONTEXT} ) start_sources() -add_sources( SOURCE_GROUP "Core" +add_sources( SOURCE_GROUP "Runtime" "localize.cpp" "localize.h" ) diff --git a/r5dev/materialsystem/CMakeLists.txt b/r5dev/materialsystem/CMakeLists.txt index 0936e7a4..e1cad016 100644 --- a/r5dev/materialsystem/CMakeLists.txt +++ b/r5dev/materialsystem/CMakeLists.txt @@ -3,7 +3,7 @@ add_module( "lib" "materialsystem" "vpc" ${FOLDER_CONTEXT} ) start_sources() -add_sources( SOURCE_GROUP "Core" +add_sources( SOURCE_GROUP "Runtime" "cmaterialglue.cpp" "cmaterialglue.h" "cmaterialsystem.cpp" diff --git a/r5dev/netconsole/CMakeLists.txt b/r5dev/netconsole/CMakeLists.txt index 0856e0df..bcfaedba 100644 --- a/r5dev/netconsole/CMakeLists.txt +++ b/r5dev/netconsole/CMakeLists.txt @@ -43,7 +43,8 @@ target_link_libraries( ${PROJECT_NAME} PRIVATE "tier2" "libprotobuf" "libspdlog" - "protocol_pb" + "SV_RCon_PB" + "CL_RCon_PB" "Rpcrt4.lib" "ws2_32.lib" ) diff --git a/r5dev/networksystem/CMakeLists.txt b/r5dev/networksystem/CMakeLists.txt index c3247e0d..e1a9b9ad 100644 --- a/r5dev/networksystem/CMakeLists.txt +++ b/r5dev/networksystem/CMakeLists.txt @@ -3,13 +3,16 @@ add_module( "lib" "networksystem" "vpc" ${FOLDER_CONTEXT} ) start_sources() -add_sources( SOURCE_GROUP "Core" +add_sources( SOURCE_GROUP "Private" "bansystem.cpp" "bansystem.h" "listmanager.cpp" "listmanager.h" "pylon.cpp" "pylon.h" +) + +add_sources( SOURCE_GROUP "Public" "serverlisting.h" "sm_protocol.h" ) diff --git a/r5dev/pluginsdk/CMakeLists.txt b/r5dev/pluginsdk/CMakeLists.txt index 818c951f..393ef3e1 100644 --- a/r5dev/pluginsdk/CMakeLists.txt +++ b/r5dev/pluginsdk/CMakeLists.txt @@ -18,7 +18,9 @@ target_link_libraries( ${PROJECT_NAME} PRIVATE "libprotobuf" "liblzham" "libspdlog" - "protocol_pb" + "SigCache_PB" + "SV_RCon_PB" + "CL_RCon_PB" "Rpcrt4.lib" ) diff --git a/r5dev/pluginsystem/CMakeLists.txt b/r5dev/pluginsystem/CMakeLists.txt index 357cffe7..7554c3d4 100644 --- a/r5dev/pluginsystem/CMakeLists.txt +++ b/r5dev/pluginsystem/CMakeLists.txt @@ -3,12 +3,15 @@ add_module( "lib" "pluginsystem" "vpc" ${FOLDER_CONTEXT} ) start_sources() -add_sources( SOURCE_GROUP "Core" - "ipluginsystem.h" +add_sources( SOURCE_GROUP "Private" "modsystem.cpp" "modsystem.h" "pluginsystem.cpp" "pluginsystem.h" ) +add_sources( SOURCE_GROUP "Public" + "ipluginsystem.h" +) + end_sources() diff --git a/r5dev/protoc/CMakeLists.txt b/r5dev/protoc/CMakeLists.txt index d71d771f..20ed5ef7 100644 --- a/r5dev/protoc/CMakeLists.txt +++ b/r5dev/protoc/CMakeLists.txt @@ -1,18 +1,33 @@ cmake_minimum_required( VERSION 3.16 ) -add_module( "lib" "protocol_pb" "vpc" ${FOLDER_CONTEXT} ) +add_module( "lib" "SigCache_PB" "vpc" ${FOLDER_CONTEXT} ) start_sources() -add_sources( SOURCE_GROUP "NetCon" - "cl_rcon.pb.cc" - "cl_rcon.pb.h" - "sv_rcon.pb.cc" - "sv_rcon.pb.h" -) - -add_sources( SOURCE_GROUP "SigCache" +add_sources( SOURCE_GROUP "Runtime" "sig_map.pb.cc" "sig_map.pb.h" ) end_sources() + +add_module( "lib" "SV_RCon_PB" "vpc" ${FOLDER_CONTEXT} ) + +start_sources() + +add_sources( SOURCE_GROUP "Runtime" + "sv_rcon.pb.cc" + "sv_rcon.pb.h" +) + +end_sources() + +add_module( "lib" "CL_RCon_PB" "vpc" ${FOLDER_CONTEXT} ) + +start_sources() + +add_sources( SOURCE_GROUP "Runtime" + "cl_rcon.pb.cc" + "cl_rcon.pb.h" +) + +end_sources() diff --git a/r5dev/thirdparty/detours/CMakeLists.txt b/r5dev/thirdparty/detours/CMakeLists.txt index b90ae810..3b639f7e 100644 --- a/r5dev/thirdparty/detours/CMakeLists.txt +++ b/r5dev/thirdparty/detours/CMakeLists.txt @@ -3,11 +3,14 @@ add_module( "lib" "libdetours" "" ${FOLDER_CONTEXT} ) start_sources() -add_sources( SOURCE_GROUP "Runtime" +add_sources( SOURCE_GROUP "Source" "src/creatwth.cpp" "src/detours.cpp" "src/disasm.cpp" "src/modules.cpp" +) + +add_sources( SOURCE_GROUP "Include" "include/detours.h" "include/detver.h" "include/idetour.h" diff --git a/r5dev/tier0/CMakeLists.txt b/r5dev/tier0/CMakeLists.txt index 8f58381d..03fb07fe 100644 --- a/r5dev/tier0/CMakeLists.txt +++ b/r5dev/tier0/CMakeLists.txt @@ -34,33 +34,11 @@ add_sources( SOURCE_GROUP "Runtime" "binstream.cpp" ) +file( GLOB TIER0_PUBLIC_HEADERS + "${ENGINE_SOURCE_DIR}/public/tier0/*" +) add_sources( SOURCE_GROUP "Public" - "${ENGINE_SOURCE_DIR}/public/tier0/annotations.h" - "${ENGINE_SOURCE_DIR}/public/tier0/basetypes.h" - "${ENGINE_SOURCE_DIR}/public/tier0/commonmacros.h" - "${ENGINE_SOURCE_DIR}/public/tier0/crashhandler.h" - "${ENGINE_SOURCE_DIR}/public/tier0/dbg.h" - "${ENGINE_SOURCE_DIR}/public/tier0/dbgflag.h" - "${ENGINE_SOURCE_DIR}/public/tier0/fasttimer.h" - "${ENGINE_SOURCE_DIR}/public/tier0/frametask.h" - "${ENGINE_SOURCE_DIR}/public/tier0/jobthread.h" - "${ENGINE_SOURCE_DIR}/public/tier0/memaddr.h" - "${ENGINE_SOURCE_DIR}/public/tier0/memalloc.h" - "${ENGINE_SOURCE_DIR}/public/tier0/memdbgoff.h" - "${ENGINE_SOURCE_DIR}/public/tier0/memdbgon.h" - "${ENGINE_SOURCE_DIR}/public/tier0/module.h" - "${ENGINE_SOURCE_DIR}/public/tier0/platform.h" - "${ENGINE_SOURCE_DIR}/public/tier0/platform_internal.h" - "${ENGINE_SOURCE_DIR}/public/tier0/sigcache.h" - "${ENGINE_SOURCE_DIR}/public/tier0/threadtools.h" - "${ENGINE_SOURCE_DIR}/public/tier0/tslist.h" - "${ENGINE_SOURCE_DIR}/public/tier0/valve_off.h" - "${ENGINE_SOURCE_DIR}/public/tier0/valve_on.h" - "${ENGINE_SOURCE_DIR}/public/tier0/vtable.h" - "${ENGINE_SOURCE_DIR}/public/tier0/wchartypes.h" - "${ENGINE_SOURCE_DIR}/public/tier0/tier0_iface.h" - "${ENGINE_SOURCE_DIR}/public/tier0/utility.h" - "${ENGINE_SOURCE_DIR}/public/tier0/binstream.h" + "${TIER0_PUBLIC_HEADERS}" ) end_sources() diff --git a/r5dev/tier1/CMakeLists.txt b/r5dev/tier1/CMakeLists.txt index b5b48ab5..94c7e0db 100644 --- a/r5dev/tier1/CMakeLists.txt +++ b/r5dev/tier1/CMakeLists.txt @@ -25,31 +25,11 @@ add_sources( SOURCE_GROUP "Private" "cvar.cpp" ) +file( GLOB TIER1_PUBLIC_HEADERS + "${ENGINE_SOURCE_DIR}/public/tier1/*" +) add_sources( SOURCE_GROUP "Public" - "${ENGINE_SOURCE_DIR}/public/tier1/bitbuf.h" - "${ENGINE_SOURCE_DIR}/public/tier1/byteswap.h" - "${ENGINE_SOURCE_DIR}/public/tier1/characterset.h" - "${ENGINE_SOURCE_DIR}/public/tier1/cmd.h" - "${ENGINE_SOURCE_DIR}/public/tier1/cvar.h" - "${ENGINE_SOURCE_DIR}/public/tier1/generichash.h" - "${ENGINE_SOURCE_DIR}/public/tier1/lzss.h" - "${ENGINE_SOURCE_DIR}/public/tier1/mempool.h" - "${ENGINE_SOURCE_DIR}/public/tier1/memstack.h" - "${ENGINE_SOURCE_DIR}/public/tier1/NetAdr.h" - "${ENGINE_SOURCE_DIR}/public/tier1/NetKey.h" - "${ENGINE_SOURCE_DIR}/public/tier1/stringpool.h" - "${ENGINE_SOURCE_DIR}/public/tier1/strtools.h" - "${ENGINE_SOURCE_DIR}/public/tier1/utlblockmemory.h" - "${ENGINE_SOURCE_DIR}/public/tier1/utlbuffer.h" - "${ENGINE_SOURCE_DIR}/public/tier1/utldict.h" - "${ENGINE_SOURCE_DIR}/public/tier1/utlfixedmemory.h" - "${ENGINE_SOURCE_DIR}/public/tier1/utllinkedlist.h" - "${ENGINE_SOURCE_DIR}/public/tier1/utlmap.h" - "${ENGINE_SOURCE_DIR}/public/tier1/utlmemory.h" - "${ENGINE_SOURCE_DIR}/public/tier1/utlrbtree.h" - "${ENGINE_SOURCE_DIR}/public/tier1/utlstring.h" - "${ENGINE_SOURCE_DIR}/public/tier1/utlsymbol.h" - "${ENGINE_SOURCE_DIR}/public/tier1/utlvector.h" + "${TIER1_PUBLIC_HEADERS}" ) end_sources() diff --git a/r5dev/tier2/CMakeLists.txt b/r5dev/tier2/CMakeLists.txt index d79b497f..65968c26 100644 --- a/r5dev/tier2/CMakeLists.txt +++ b/r5dev/tier2/CMakeLists.txt @@ -11,12 +11,11 @@ add_sources( SOURCE_GROUP "Utility" "socketcreator.cpp" ) +file( GLOB TIER2_PUBLIC_HEADERS + "${ENGINE_SOURCE_DIR}/public/tier2/*" +) add_sources( SOURCE_GROUP "Public" - "${ENGINE_SOURCE_DIR}/public/tier2/curlutils.h" - "${ENGINE_SOURCE_DIR}/public/tier2/fileutils.h" - "${ENGINE_SOURCE_DIR}/public/tier2/meshutils.h" - "${ENGINE_SOURCE_DIR}/public/tier2/renderutils.h" - "${ENGINE_SOURCE_DIR}/public/tier2/socketcreator.h" + "${TIER2_PUBLIC_HEADERS}" ) end_sources() diff --git a/r5dev/vgui/CMakeLists.txt b/r5dev/vgui/CMakeLists.txt index 3261e553..0fa5648d 100644 --- a/r5dev/vgui/CMakeLists.txt +++ b/r5dev/vgui/CMakeLists.txt @@ -7,6 +7,9 @@ add_sources( SOURCE_GROUP "Runtime" "vgui.h" "vgui_baseui_interface.cpp" "vgui_baseui_interface.h" +) + +add_sources( SOURCE_GROUP "Debug" "vgui_debugpanel.cpp" "vgui_debugpanel.h" "vgui_fpspanel.cpp" diff --git a/r5dev/vscript/CMakeLists.txt b/r5dev/vscript/CMakeLists.txt index 949d5055..e80cda7c 100644 --- a/r5dev/vscript/CMakeLists.txt +++ b/r5dev/vscript/CMakeLists.txt @@ -11,14 +11,24 @@ add_sources( SOURCE_GROUP "Private" add_sources( SOURCE_GROUP "Squirrel_RE" "languages/squirrel_re/vsquirrel.cpp" "languages/squirrel_re/vsquirrel.h" +) + +add_sources( SOURCE_GROUP "Squirrel_RE/squirrel" + "languages/squirrel_re/squirrel/sqapi.cpp" + "languages/squirrel_re/squirrel/sqvm.cpp" +) + +add_sources( SOURCE_GROUP "Squirrel_RE/sqstdlib" + "languages/squirrel_re/sqstdlib/sqstdaux.cpp" +) + +add_sources( SOURCE_GROUP "Squirrel_RE/include" + "languages/squirrel_re/vsquirrel.cpp" + "languages/squirrel_re/vsquirrel.h" "languages/squirrel_re/include/sqstate.h" "languages/squirrel_re/include/sqstdaux.h" "languages/squirrel_re/include/squirrel.h" "languages/squirrel_re/include/sqvm.h" - - "languages/squirrel_re/sqstdlib/sqstdaux.cpp" - "languages/squirrel_re/squirrel/sqapi.cpp" - "languages/squirrel_re/squirrel/sqvm.cpp" ) add_sources( SOURCE_GROUP "Public" diff --git a/r5dev/vstdlib/CMakeLists.txt b/r5dev/vstdlib/CMakeLists.txt index 1017f3be..aeed0cf4 100644 --- a/r5dev/vstdlib/CMakeLists.txt +++ b/r5dev/vstdlib/CMakeLists.txt @@ -15,7 +15,7 @@ add_sources( SOURCE_GROUP "Private" end_sources() -target_include_directories( ${PROJECT_NAME} PRIVATE +target_include_directories( ${PROJECT_NAME} PRIVATE "${ENGINE_SOURCE_DIR}/tier0/" "${ENGINE_SOURCE_DIR}/tier1/" )