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

Cleanup CMakeLists files

Browse Source 
Light cleanup in CMakeLists files. Split protocols and improve filter names.
This commit is contained in:
Kawe Mazidjatari 2023-05-14 17:36:08 +02:00
parent fd9152862d
commit 6a86ae2606
19 changed files with 84 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
r5dev/CMakeLists.txt
View File

@ -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 )

5
r5dev/core/CMakeLists.txt
View File

@ -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"

2
r5dev/datacache/CMakeLists.txt
View File

@ -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"
)

2
r5dev/inputsystem/CMakeLists.txt
View File

@ -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"
)

2
r5dev/launcher/CMakeLists.txt
View File

@ -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"

2
r5dev/localize/CMakeLists.txt
View File

@ -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"
)

2
r5dev/materialsystem/CMakeLists.txt
View File

@ -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"

3
r5dev/netconsole/CMakeLists.txt
View File

@ -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"
)

5
r5dev/networksystem/CMakeLists.txt
View File

@ -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"
)

4
r5dev/pluginsdk/CMakeLists.txt
View File

@ -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"
)

7
r5dev/pluginsystem/CMakeLists.txt
View File

@ -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()

33
r5dev/protoc/CMakeLists.txt
View File

@ -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()

5
r5dev/thirdparty/detours/CMakeLists.txt vendored
View File

@ -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"

30
r5dev/tier0/CMakeLists.txt
View File

@ -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()

28
r5dev/tier1/CMakeLists.txt
View File

@ -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()

9
r5dev/tier2/CMakeLists.txt
View File

@ -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()

3
r5dev/vgui/CMakeLists.txt
View File

@ -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"

18
r5dev/vscript/CMakeLists.txt
View File

@ -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"

2
r5dev/vstdlib/CMakeLists.txt
View File

@ -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/"
)