From 3f8baf6f68a83a0b3fed411d42bcb067c0fa667c Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Sat, 17 Jun 2023 00:45:27 +0200
Subject: [PATCH] Allow setting compile options for specific targets

Previously, it was all controlled from the global init (applied to all projects), but some projects need different options. With these changes, you can disable the common options applied in the 'add_module' macro, and set your own if desired.
---
 r5dev/appframework/CMakeLists.txt        |  2 +-
 r5dev/cmake/Configure.cmake              |  3 ++-
 r5dev/cmake/Macros.cmake                 | 16 +++++++++++++++-
 r5dev/cmake/Options.cmake                | 10 +---------
 r5dev/codecs/CMakeLists.txt              |  2 +-
 r5dev/core/CMakeLists.txt                |  2 +-
 r5dev/datacache/CMakeLists.txt           |  2 +-
 r5dev/ebisusdk/CMakeLists.txt            |  2 +-
 r5dev/engine/CMakeLists.txt              |  2 +-
 r5dev/filesystem/CMakeLists.txt          |  2 +-
 r5dev/game/CMakeLists.txt                |  2 +-
 r5dev/gameui/CMakeLists.txt              |  2 +-
 r5dev/inputsystem/CMakeLists.txt         |  2 +-
 r5dev/launcher/CMakeLists.txt            |  2 +-
 r5dev/localize/CMakeLists.txt            |  2 +-
 r5dev/materialsystem/CMakeLists.txt      |  2 +-
 r5dev/mathlib/CMakeLists.txt             |  2 +-
 r5dev/naveditor/CMakeLists.txt           |  2 +-
 r5dev/netconsole/CMakeLists.txt          |  2 +-
 r5dev/networksystem/CMakeLists.txt       |  2 +-
 r5dev/pluginsdk/CMakeLists.txt           |  2 +-
 r5dev/pluginsystem/CMakeLists.txt        |  2 +-
 r5dev/protoc/CMakeLists.txt              |  6 +++---
 r5dev/rtech/CMakeLists.txt               |  8 ++++----
 r5dev/sdklauncher/CMakeLists.txt         |  2 +-
 r5dev/studiorender/CMakeLists.txt        |  2 +-
 r5dev/thirdparty/cppnet/CMakeLists.txt   |  2 +-
 r5dev/thirdparty/curl/CMakeLists.txt     |  2 +-
 r5dev/thirdparty/detours/CMakeLists.txt  |  2 +-
 r5dev/thirdparty/fastlz/CMakeLists.txt   |  2 +-
 r5dev/thirdparty/imgui/CMakeLists.txt    |  2 +-
 r5dev/thirdparty/lzham/CMakeLists.txt    |  2 +-
 r5dev/thirdparty/protobuf/CMakeLists.txt |  2 +-
 r5dev/thirdparty/recast/CMakeLists.txt   | 10 +++++-----
 r5dev/thirdparty/sdl/CMakeLists.txt      |  2 +-
 r5dev/thirdparty/spdlog/CMakeLists.txt   |  2 +-
 r5dev/tier0/CMakeLists.txt               |  2 +-
 r5dev/tier1/CMakeLists.txt               |  2 +-
 r5dev/tier2/CMakeLists.txt               |  2 +-
 r5dev/vgui/CMakeLists.txt                |  2 +-
 r5dev/vguimatsurface/CMakeLists.txt      |  2 +-
 r5dev/vpc/CMakeLists.txt                 |  2 +-
 r5dev/vphysics/CMakeLists.txt            |  2 +-
 r5dev/vpklib/CMakeLists.txt              |  2 +-
 r5dev/vscript/CMakeLists.txt             |  2 +-
 r5dev/vstdlib/CMakeLists.txt             |  2 +-
 46 files changed, 70 insertions(+), 63 deletions(-)

diff --git a/r5dev/appframework/CMakeLists.txt b/r5dev/appframework/CMakeLists.txt
index dce22f16..34f7a959 100644
--- a/r5dev/appframework/CMakeLists.txt
+++ b/r5dev/appframework/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "appframework" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "appframework" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/cmake/Configure.cmake b/r5dev/cmake/Configure.cmake
index c1f81670..2fb7c030 100644
--- a/r5dev/cmake/Configure.cmake
+++ b/r5dev/cmake/Configure.cmake
@@ -5,7 +5,8 @@ macro( initial_setup )
     set( CMAKE_CXX_STANDARD 17 )
     set( CMAKE_CXX_STANDARD_REQUIRED True )
 
-    set(ENGINE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/r5dev" CACHE PATH "Engine source directory")
+    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( GLOBAL_PCH
         "${ENGINE_SOURCE_DIR}/core/stdafx.h"
diff --git a/r5dev/cmake/Macros.cmake b/r5dev/cmake/Macros.cmake
index 02c5d043..090a3a89 100644
--- a/r5dev/cmake/Macros.cmake
+++ b/r5dev/cmake/Macros.cmake
@@ -44,7 +44,7 @@ endmacro()
 # -----------------------------------------------------------------------------
 # Add modules to the project
 # -----------------------------------------------------------------------------
-macro( add_module MODULE_TYPE MODULE_NAME REUSE_PCH FOLDER_NAME WARNINGS_AS_ERRORS )
+macro( add_module MODULE_TYPE MODULE_NAME REUSE_PCH FOLDER_NAME WARNINGS_AS_ERRORS APPLY_COMPILE_OPTIONS )
     project( ${MODULE_NAME} )
 
     if( ${MODULE_TYPE} STREQUAL "lib" )
@@ -72,6 +72,20 @@ macro( add_module MODULE_TYPE MODULE_NAME REUSE_PCH FOLDER_NAME WARNINGS_AS_ERRO
     if( ${GLOBAL_WARNINGS_AS_ERRORS} )
         warnings_as_errors( ${PROJECT_NAME} ${WARNINGS_AS_ERRORS} )
     endif()
+
+    if ( NOT "${APPLY_COMPILE_OPTIONS}" STREQUAL "FALSE" )
+        target_compile_options( ${PROJECT_NAME} PRIVATE
+            $<$<AND:$<CXX_COMPILER_ID:MSVC>,$<CONFIG:Release>>:/Ob2>
+            $<$<AND:$<CXX_COMPILER_ID:MSVC>,$<CONFIG:Release>>:/Oi>
+            $<$<AND:$<CXX_COMPILER_ID:MSVC>,$<CONFIG:Release>>:/Ot>
+            $<$<AND:$<CXX_COMPILER_ID:MSVC>,$<CONFIG:Release>>:/GS->
+            $<$<AND:$<CXX_COMPILER_ID:MSVC>,$<CONFIG:Release>>:/Gy>
+            $<$<AND:$<CXX_COMPILER_ID:MSVC>,$<CONFIG:Release>>:/fp:fast>
+
+            $<$<CXX_COMPILER_ID:MSVC>:/D_UNICODE>
+            $<$<CXX_COMPILER_ID:MSVC>:/DUNICODE>
+    )
+    endif()
 endmacro()
 
 # -----------------------------------------------------------------------------
diff --git a/r5dev/cmake/Options.cmake b/r5dev/cmake/Options.cmake
index deba7549..9a168176 100644
--- a/r5dev/cmake/Options.cmake
+++ b/r5dev/cmake/Options.cmake
@@ -10,8 +10,6 @@ macro( apply_project_settings )
         $<$<CXX_COMPILER_ID:MSVC>:/Zi>
         $<$<CXX_COMPILER_ID:MSVC>:/W4>
         $<$<CXX_COMPILER_ID:MSVC>:/GR>
-        $<$<CXX_COMPILER_ID:MSVC>:/D_UNICODE>
-        $<$<CXX_COMPILER_ID:MSVC>:/DUNICODE>
     )
 
     # Suppress certain compiler warnings
@@ -56,15 +54,9 @@ macro( apply_project_settings )
 
     # Set settings for Release configuration
     add_compile_options(
-        $<$<AND:$<CXX_COMPILER_ID:MSVC>,$<CONFIG:Release>>:/Ob2>
-        $<$<AND:$<CXX_COMPILER_ID:MSVC>,$<CONFIG:Release>>:/Oi>
-        $<$<AND:$<CXX_COMPILER_ID:MSVC>,$<CONFIG:Release>>:/Ot>
         $<$<AND:$<CXX_COMPILER_ID:MSVC>,$<CONFIG:Release>>:/GF>
         $<$<AND:$<CXX_COMPILER_ID:MSVC>,$<CONFIG:Release>>:/MT>
-        $<$<AND:$<CXX_COMPILER_ID:MSVC>,$<CONFIG:Release>>:/GS->
-        $<$<AND:$<CXX_COMPILER_ID:MSVC>,$<CONFIG:Release>>:/Gy>
         $<$<AND:$<CXX_COMPILER_ID:MSVC>,$<CONFIG:Release>>:/EHsc>
-        $<$<AND:$<CXX_COMPILER_ID:MSVC>,$<CONFIG:Release>>:/fp:fast>
     )
 
     set( CMAKE_EXE_LINKER_FLAGS_RELEASE
@@ -76,7 +68,7 @@ macro( apply_project_settings )
         /DEBUG"
     )
 
-    # Commonly used directories accross libraries
+    # Commonly used directories across libraries
     include_directories(
         "${ENGINE_SOURCE_DIR}/"
         "${ENGINE_SOURCE_DIR}/public/"
diff --git a/r5dev/codecs/CMakeLists.txt b/r5dev/codecs/CMakeLists.txt
index 40e40c9c..6cbfc8ca 100644
--- a/r5dev/codecs/CMakeLists.txt
+++ b/r5dev/codecs/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "codecs" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "codecs" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/core/CMakeLists.txt b/r5dev/core/CMakeLists.txt
index 481ddd75..00561418 100644
--- a/r5dev/core/CMakeLists.txt
+++ b/r5dev/core/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required( VERSION 3.16 )
 macro( add_sdk_project PROJECT_NAME )
-add_module( "shared_lib" ${PROJECT_NAME} "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "shared_lib" ${PROJECT_NAME} "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/datacache/CMakeLists.txt b/r5dev/datacache/CMakeLists.txt
index f6a688c9..e3520a11 100644
--- a/r5dev/datacache/CMakeLists.txt
+++ b/r5dev/datacache/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "datacache" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "datacache" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/ebisusdk/CMakeLists.txt b/r5dev/ebisusdk/CMakeLists.txt
index 6c9e82c1..f14f5a12 100644
--- a/r5dev/ebisusdk/CMakeLists.txt
+++ b/r5dev/ebisusdk/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "EbisuSDK" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "EbisuSDK" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/engine/CMakeLists.txt b/r5dev/engine/CMakeLists.txt
index 1c391469..79499725 100644
--- a/r5dev/engine/CMakeLists.txt
+++ b/r5dev/engine/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required( VERSION 3.16 )
 
 macro( add_engine_project PROJECT_NAME )
-add_module( "lib" ${PROJECT_NAME} "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" ${PROJECT_NAME} "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/filesystem/CMakeLists.txt b/r5dev/filesystem/CMakeLists.txt
index 5003c7a2..a226c117 100644
--- a/r5dev/filesystem/CMakeLists.txt
+++ b/r5dev/filesystem/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "filesystem" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "filesystem" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/game/CMakeLists.txt b/r5dev/game/CMakeLists.txt
index 00d58227..c620400e 100644
--- a/r5dev/game/CMakeLists.txt
+++ b/r5dev/game/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "game" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "game" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/gameui/CMakeLists.txt b/r5dev/gameui/CMakeLists.txt
index 0b0c3458..6b282605 100644
--- a/r5dev/gameui/CMakeLists.txt
+++ b/r5dev/gameui/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "gameui" "vpc" ${FOLDER_CONTEXT}  TRUE )
+add_module( "lib" "gameui" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/inputsystem/CMakeLists.txt b/r5dev/inputsystem/CMakeLists.txt
index a472a8f2..c22fca6f 100644
--- a/r5dev/inputsystem/CMakeLists.txt
+++ b/r5dev/inputsystem/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "inputsystem" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "inputsystem" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/launcher/CMakeLists.txt b/r5dev/launcher/CMakeLists.txt
index ded0dfa0..d4bc14f6 100644
--- a/r5dev/launcher/CMakeLists.txt
+++ b/r5dev/launcher/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "launcher" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "launcher" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/localize/CMakeLists.txt b/r5dev/localize/CMakeLists.txt
index 878afc7d..8f1a26a3 100644
--- a/r5dev/localize/CMakeLists.txt
+++ b/r5dev/localize/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "localize" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "localize" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/materialsystem/CMakeLists.txt b/r5dev/materialsystem/CMakeLists.txt
index dcc7f588..9dfd63b2 100644
--- a/r5dev/materialsystem/CMakeLists.txt
+++ b/r5dev/materialsystem/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "materialsystem" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "materialsystem" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/mathlib/CMakeLists.txt b/r5dev/mathlib/CMakeLists.txt
index 0eadc9ab..2095608d 100644
--- a/r5dev/mathlib/CMakeLists.txt
+++ b/r5dev/mathlib/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "mathlib" "" ${FOLDER_CONTEXT} TRUE)
+add_module( "lib" "mathlib" "" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/naveditor/CMakeLists.txt b/r5dev/naveditor/CMakeLists.txt
index b607b54b..a02cd2aa 100644
--- a/r5dev/naveditor/CMakeLists.txt
+++ b/r5dev/naveditor/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "exe" "naveditor" "" ${FOLDER_CONTEXT} TRUE )
+add_module( "exe" "naveditor" "" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/netconsole/CMakeLists.txt b/r5dev/netconsole/CMakeLists.txt
index 4f4428bf..67cfc6f4 100644
--- a/r5dev/netconsole/CMakeLists.txt
+++ b/r5dev/netconsole/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "exe" "netconsole" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "exe" "netconsole" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/networksystem/CMakeLists.txt b/r5dev/networksystem/CMakeLists.txt
index c5608079..c379fbe6 100644
--- a/r5dev/networksystem/CMakeLists.txt
+++ b/r5dev/networksystem/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "networksystem" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "networksystem" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/pluginsdk/CMakeLists.txt b/r5dev/pluginsdk/CMakeLists.txt
index 8d306942..4e1035b1 100644
--- a/r5dev/pluginsdk/CMakeLists.txt
+++ b/r5dev/pluginsdk/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "shared_lib" "PluginSDK" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "shared_lib" "PluginSDK" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/pluginsystem/CMakeLists.txt b/r5dev/pluginsystem/CMakeLists.txt
index 801c13d6..0cee22be 100644
--- a/r5dev/pluginsystem/CMakeLists.txt
+++ b/r5dev/pluginsystem/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "pluginsystem" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "pluginsystem" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/protoc/CMakeLists.txt b/r5dev/protoc/CMakeLists.txt
index 9beb2e59..88ff5c7f 100644
--- a/r5dev/protoc/CMakeLists.txt
+++ b/r5dev/protoc/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "SigCache_Pb" "vpc" ${FOLDER_CONTEXT} FALSE )
+add_module( "lib" "SigCache_Pb" "vpc" ${FOLDER_CONTEXT} FALSE TRUE )
 
 start_sources()
 
@@ -11,7 +11,7 @@ add_sources( SOURCE_GROUP "Runtime"
 end_sources()
 thirdparty_suppress_warnings()
 
-add_module( "lib" "SV_RCon_Pb" "vpc" ${FOLDER_CONTEXT} FALSE )
+add_module( "lib" "SV_RCon_Pb" "vpc" ${FOLDER_CONTEXT} FALSE TRUE )
 
 start_sources()
 
@@ -23,7 +23,7 @@ add_sources( SOURCE_GROUP "Runtime"
 end_sources()
 thirdparty_suppress_warnings()
 
-add_module( "lib" "CL_RCon_Pb" "vpc" ${FOLDER_CONTEXT} FALSE )
+add_module( "lib" "CL_RCon_Pb" "vpc" ${FOLDER_CONTEXT} FALSE TRUE )
 
 start_sources()
 
diff --git a/r5dev/rtech/CMakeLists.txt b/r5dev/rtech/CMakeLists.txt
index a3b78e05..013e3f4e 100644
--- a/r5dev/rtech/CMakeLists.txt
+++ b/r5dev/rtech/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "rtech_game" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "rtech_game" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
@@ -10,7 +10,7 @@ add_sources( SOURCE_GROUP "Source"
 
 end_sources()
 
-add_module( "lib" "rtech_tools" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "rtech_tools" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
@@ -19,7 +19,7 @@ add_sources( SOURCE_GROUP "Source"
    "rtech_utils.h"
 )
 
-add_module( "lib" "rui" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "rui" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
@@ -28,7 +28,7 @@ add_sources( SOURCE_GROUP "Source"
    "rui/rui.h"
 )
 
-add_module( "lib" "stryder" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "stryder" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/sdklauncher/CMakeLists.txt b/r5dev/sdklauncher/CMakeLists.txt
index f7f9216a..c1a32611 100644
--- a/r5dev/sdklauncher/CMakeLists.txt
+++ b/r5dev/sdklauncher/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "exe" "sdklauncher" "" ${FOLDER_CONTEXT} TRUE )
+add_module( "exe" "sdklauncher" "" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/studiorender/CMakeLists.txt b/r5dev/studiorender/CMakeLists.txt
index 35033112..0b18b4be 100644
--- a/r5dev/studiorender/CMakeLists.txt
+++ b/r5dev/studiorender/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "studiorender" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "studiorender" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/thirdparty/cppnet/CMakeLists.txt b/r5dev/thirdparty/cppnet/CMakeLists.txt
index 6eac67fe..5da27702 100644
--- a/r5dev/thirdparty/cppnet/CMakeLists.txt
+++ b/r5dev/thirdparty/cppnet/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "libcppkore" "" ${FOLDER_CONTEXT} FALSE )
+add_module( "lib" "libcppkore" "" ${FOLDER_CONTEXT} FALSE TRUE )
 
 start_sources()
 
diff --git a/r5dev/thirdparty/curl/CMakeLists.txt b/r5dev/thirdparty/curl/CMakeLists.txt
index 8b353fe9..1032599f 100644
--- a/r5dev/thirdparty/curl/CMakeLists.txt
+++ b/r5dev/thirdparty/curl/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "libcurl" "" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "libcurl" "" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/thirdparty/detours/CMakeLists.txt b/r5dev/thirdparty/detours/CMakeLists.txt
index 6e0fbcd7..ba2b7b09 100644
--- a/r5dev/thirdparty/detours/CMakeLists.txt
+++ b/r5dev/thirdparty/detours/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "libdetours" "" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "libdetours" "" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/thirdparty/fastlz/CMakeLists.txt b/r5dev/thirdparty/fastlz/CMakeLists.txt
index b834aa1d..9ed4bd29 100644
--- a/r5dev/thirdparty/fastlz/CMakeLists.txt
+++ b/r5dev/thirdparty/fastlz/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "FastLZ" "" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "FastLZ" "" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/thirdparty/imgui/CMakeLists.txt b/r5dev/thirdparty/imgui/CMakeLists.txt
index 746a11f9..1bec7d7b 100644
--- a/r5dev/thirdparty/imgui/CMakeLists.txt
+++ b/r5dev/thirdparty/imgui/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "libimgui" "" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "libimgui" "" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/thirdparty/lzham/CMakeLists.txt b/r5dev/thirdparty/lzham/CMakeLists.txt
index 55e2d4aa..0742d379 100644
--- a/r5dev/thirdparty/lzham/CMakeLists.txt
+++ b/r5dev/thirdparty/lzham/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "liblzham" "" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "liblzham" "" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/thirdparty/protobuf/CMakeLists.txt b/r5dev/thirdparty/protobuf/CMakeLists.txt
index c7657395..5ed5f098 100644
--- a/r5dev/thirdparty/protobuf/CMakeLists.txt
+++ b/r5dev/thirdparty/protobuf/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "libprotobuf" "" ${FOLDER_CONTEXT} FALSE )
+add_module( "lib" "libprotobuf" "" ${FOLDER_CONTEXT} FALSE TRUE )
 
 start_sources()
 
diff --git a/r5dev/thirdparty/recast/CMakeLists.txt b/r5dev/thirdparty/recast/CMakeLists.txt
index 3dc8bf52..3309cc5f 100644
--- a/r5dev/thirdparty/recast/CMakeLists.txt
+++ b/r5dev/thirdparty/recast/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required( VERSION 3.16 )
 # -----------------------------------------------------------------------------
 # Recast & Detour debug utilities
 # -----------------------------------------------------------------------------
-add_module( "lib" "navdebugutils" "" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "navdebugutils" "" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
@@ -31,7 +31,7 @@ target_precompile_headers( ${PROJECT_NAME} PRIVATE
 # -----------------------------------------------------------------------------
 # Detour runtime
 # -----------------------------------------------------------------------------
-add_module( "lib" "libdetour" "navdebugutils" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "libdetour" "navdebugutils" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
@@ -63,7 +63,7 @@ whole_program_optimization()
 # -----------------------------------------------------------------------------
 # Detour crowd
 # -----------------------------------------------------------------------------
-add_module( "lib" "libdetourcrowd" "navdebugutils" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "libdetourcrowd" "navdebugutils" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
@@ -93,7 +93,7 @@ whole_program_optimization()
 # -----------------------------------------------------------------------------
 # Detour tile cache
 # -----------------------------------------------------------------------------
-add_module( "lib" "libdetourtilecache" "navdebugutils" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "libdetourtilecache" "navdebugutils" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
@@ -113,7 +113,7 @@ whole_program_optimization()
 # -----------------------------------------------------------------------------
 # Recast runtime
 # -----------------------------------------------------------------------------
-add_module( "lib" "librecast" "navdebugutils" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "librecast" "navdebugutils" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/thirdparty/sdl/CMakeLists.txt b/r5dev/thirdparty/sdl/CMakeLists.txt
index 1813cd2b..0a3edb76 100644
--- a/r5dev/thirdparty/sdl/CMakeLists.txt
+++ b/r5dev/thirdparty/sdl/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "libsdl2" "" ${FOLDER_CONTEXT} FALSE )
+add_module( "lib" "libsdl2" "" ${FOLDER_CONTEXT} FALSE TRUE )
 
 start_sources()
 
diff --git a/r5dev/thirdparty/spdlog/CMakeLists.txt b/r5dev/thirdparty/spdlog/CMakeLists.txt
index ebbb0538..fd4cb35e 100644
--- a/r5dev/thirdparty/spdlog/CMakeLists.txt
+++ b/r5dev/thirdparty/spdlog/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "libspdlog" "" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "libspdlog" "" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/tier0/CMakeLists.txt b/r5dev/tier0/CMakeLists.txt
index 6e872c5e..7d15b97a 100644
--- a/r5dev/tier0/CMakeLists.txt
+++ b/r5dev/tier0/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "tier0" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "tier0" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/tier1/CMakeLists.txt b/r5dev/tier1/CMakeLists.txt
index e657b529..11ff85b3 100644
--- a/r5dev/tier1/CMakeLists.txt
+++ b/r5dev/tier1/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "tier1" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "tier1" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/tier2/CMakeLists.txt b/r5dev/tier2/CMakeLists.txt
index 45cce894..bad7615e 100644
--- a/r5dev/tier2/CMakeLists.txt
+++ b/r5dev/tier2/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "tier2" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "tier2" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/vgui/CMakeLists.txt b/r5dev/vgui/CMakeLists.txt
index 0aa9de34..00467da4 100644
--- a/r5dev/vgui/CMakeLists.txt
+++ b/r5dev/vgui/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "vgui" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "vgui" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/vguimatsurface/CMakeLists.txt b/r5dev/vguimatsurface/CMakeLists.txt
index 2518daa4..ae983e0a 100644
--- a/r5dev/vguimatsurface/CMakeLists.txt
+++ b/r5dev/vguimatsurface/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "vguimatsurface" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "vguimatsurface" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/vpc/CMakeLists.txt b/r5dev/vpc/CMakeLists.txt
index e39511aa..fcb373b4 100644
--- a/r5dev/vpc/CMakeLists.txt
+++ b/r5dev/vpc/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "vpc" "" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "vpc" "" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/vphysics/CMakeLists.txt b/r5dev/vphysics/CMakeLists.txt
index a62ff89c..b5dc869a 100644
--- a/r5dev/vphysics/CMakeLists.txt
+++ b/r5dev/vphysics/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "vphysics" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "vphysics" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/vpklib/CMakeLists.txt b/r5dev/vpklib/CMakeLists.txt
index 833ec5bc..d367bbe2 100644
--- a/r5dev/vpklib/CMakeLists.txt
+++ b/r5dev/vpklib/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "vpklib" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "vpklib" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/vscript/CMakeLists.txt b/r5dev/vscript/CMakeLists.txt
index 7813b884..0ee8714e 100644
--- a/r5dev/vscript/CMakeLists.txt
+++ b/r5dev/vscript/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "vscript" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "vscript" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
diff --git a/r5dev/vstdlib/CMakeLists.txt b/r5dev/vstdlib/CMakeLists.txt
index bc8ab1ad..58b9dc5b 100644
--- a/r5dev/vstdlib/CMakeLists.txt
+++ b/r5dev/vstdlib/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "lib" "vstdlib" "vpc" ${FOLDER_CONTEXT} TRUE )
+add_module( "lib" "vstdlib" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()