From 739ccb1930d81e7d6d42cb9d95ac970c383309e4 Mon Sep 17 00:00:00 2001 From: SmileyAG <58108407+SmileyAG@users.noreply.github.com> Date: Fri, 11 Oct 2024 14:47:40 +0400 Subject: [PATCH] Disable the option to automatically inline functions by compiler to improve modding with tools --- linux/Makefile | 2 +- projects/vs2019/dmc_cdll.vcxproj | 2 ++ projects/vs2019/dmcdll.vcxproj | 2 ++ projects/vs2019/hl_cdll.vcxproj | 2 ++ projects/vs2019/hldll.vcxproj | 2 ++ projects/vs2019/ricochet_cdll.vcxproj | 2 ++ projects/vs2019/ricochetdll.vcxproj | 2 ++ 7 files changed, 13 insertions(+), 1 deletion(-) diff --git a/linux/Makefile b/linux/Makefile index 17b0e01b1..993e2a45e 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -101,7 +101,7 @@ BASE_CFLAGS+=-w ifeq ($(OS),Darwin) BASE_CFLAGS += -DOSX -D_OSX -fvisibility=hidden else - BASE_CFLAGS+= -DLINUX -D_LINUX + BASE_CFLAGS+= -DLINUX -D_LINUX -fno-inline endif DEDICATED_CFLAGS="-DDEDICATED -DSWDS" diff --git a/projects/vs2019/dmc_cdll.vcxproj b/projects/vs2019/dmc_cdll.vcxproj index f352a5f96..cd4b749fa 100644 --- a/projects/vs2019/dmc_cdll.vcxproj +++ b/projects/vs2019/dmc_cdll.vcxproj @@ -178,6 +178,7 @@ WIN32;_DEBUG;_WINDOWS;CLIENT_DLL;DMC_BUILD;%(PreprocessorDefinitions) MultiThreadedDebug ..\..\public;..\..\dmc\dlls;..\..\engine;..\..\common;..\..\dmc\pm_shared;..\..\utils\vgui\include;..\..\dmc\cl_dll;..\..\game_shared;..\..\external;%(AdditionalIncludeDirectories) + OnlyExplicitInline Windows @@ -205,6 +206,7 @@ call ..\..\filecopy.bat $(TargetDir)\$(TargetName).pdb ..\..\..\game\mod\cl_dlls WIN32;NDEBUG;_WINDOWS;CLIENT_DLL;DMC_BUILD;%(PreprocessorDefinitions) MultiThreaded ..\..\public;..\..\dmc\dlls;..\..\engine;..\..\common;..\..\dmc\pm_shared;..\..\utils\vgui\include;..\..\dmc\cl_dll;..\..\game_shared;..\..\external;%(AdditionalIncludeDirectories) + OnlyExplicitInline Windows diff --git a/projects/vs2019/dmcdll.vcxproj b/projects/vs2019/dmcdll.vcxproj index 9931a4418..58d4c9b9e 100644 --- a/projects/vs2019/dmcdll.vcxproj +++ b/projects/vs2019/dmcdll.vcxproj @@ -158,6 +158,7 @@ WIN32;_DEBUG;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;%(PreprocessorDefinitions) ..\..\public;..\..\game_shared;..\..\dmc\dlls;..\..\engine;..\..\common;..\..\dmc\pm_shared;..\..\dmc;%(AdditionalIncludeDirectories) MultiThreadedDebug + OnlyExplicitInline Windows @@ -183,6 +184,7 @@ call ..\..\filecopy.bat $(TargetDir)\$(TargetName).pdb ..\..\..\game\mod\dlls\$( WIN32;NDEBUG;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;%(PreprocessorDefinitions) ..\..\public;..\..\game_shared;..\..\dmc\dlls;..\..\engine;..\..\common;..\..\dmc\pm_shared;..\..\dmc;%(AdditionalIncludeDirectories) MultiThreaded + OnlyExplicitInline Windows diff --git a/projects/vs2019/hl_cdll.vcxproj b/projects/vs2019/hl_cdll.vcxproj index 8edb85ca5..ca1b9d594 100644 --- a/projects/vs2019/hl_cdll.vcxproj +++ b/projects/vs2019/hl_cdll.vcxproj @@ -62,6 +62,7 @@ MultiThreadedDebug ..\..\dlls;..\..\cl_dll;..\..\public;..\..\common;..\..\pm_shared;..\..\engine;..\..\utils\vgui\include;..\..\game_shared;..\..\external;%(AdditionalIncludeDirectories) true + OnlyExplicitInline Windows @@ -90,6 +91,7 @@ call ..\..\filecopy.bat $(TargetDir)\$(TargetName).pdb ..\..\..\game\mod\cl_dlls MultiThreaded ..\..\dlls;..\..\cl_dll;..\..\public;..\..\common;..\..\pm_shared;..\..\engine;..\..\utils\vgui\include;..\..\game_shared;..\..\external;%(AdditionalIncludeDirectories) true + OnlyExplicitInline Windows diff --git a/projects/vs2019/hldll.vcxproj b/projects/vs2019/hldll.vcxproj index a9424f98d..ca05dc167 100644 --- a/projects/vs2019/hldll.vcxproj +++ b/projects/vs2019/hldll.vcxproj @@ -62,6 +62,7 @@ true ..\..\dlls;..\..\engine;..\..\common;..\..\pm_shared;..\..\game_shared;..\..\public;%(AdditionalIncludeDirectories) MultiThreadedDebug + OnlyExplicitInline Windows @@ -88,6 +89,7 @@ call ..\..\filecopy.bat $(TargetDir)\$(TargetName).pdb ..\..\..\game\mod\dlls\$( ..\..\dlls;..\..\engine;..\..\common;..\..\pm_shared;..\..\game_shared;..\..\public;%(AdditionalIncludeDirectories) MultiThreaded true + OnlyExplicitInline Windows diff --git a/projects/vs2019/ricochet_cdll.vcxproj b/projects/vs2019/ricochet_cdll.vcxproj index 98a770344..4ac6e9324 100644 --- a/projects/vs2019/ricochet_cdll.vcxproj +++ b/projects/vs2019/ricochet_cdll.vcxproj @@ -170,6 +170,7 @@ WIN32;_DEBUG;_WINDOWS;CLIENT_DLL;%(PreprocessorDefinitions) MultiThreadedDebug ..\..\ricochet;..\..\ricochet\dlls;..\..\ricochet\cl_dll;..\..\game_shared;..\..\engine;..\..\public;..\..\common;..\..\ricochet\pm_shared;..\..\utils\vgui\include;..\..\external;%(AdditionalIncludeDirectories) + OnlyExplicitInline Windows @@ -197,6 +198,7 @@ call ..\..\filecopy.bat $(TargetDir)\$(TargetName).pdb ..\..\..\game\mod\cl_dlls WIN32;NDEBUG;_WINDOWS;CLIENT_DLL;%(PreprocessorDefinitions) MultiThreaded ..\..\ricochet;..\..\ricochet\dlls;..\..\ricochet\cl_dll;..\..\game_shared;..\..\engine;..\..\public;..\..\common;..\..\ricochet\pm_shared;..\..\utils\vgui\include;..\..\external;%(AdditionalIncludeDirectories) + OnlyExplicitInline Windows diff --git a/projects/vs2019/ricochetdll.vcxproj b/projects/vs2019/ricochetdll.vcxproj index efb342e99..a8978577a 100644 --- a/projects/vs2019/ricochetdll.vcxproj +++ b/projects/vs2019/ricochetdll.vcxproj @@ -161,6 +161,7 @@ WIN32;_DEBUG;_WINDOWS;VALVE_DLL;%(PreprocessorDefinitions) ..\..\ricochet\dlls;..\..\engine;..\..\common;..\..\public;..\..\game_shared;..\..\ricochet\pm_shared;..\..\ricochet;%(AdditionalIncludeDirectories) MultiThreadedDebug + OnlyExplicitInline Windows @@ -186,6 +187,7 @@ call ..\..\filecopy.bat $(TargetDir)\$(TargetName).pdb ..\..\..\game\mod\dlls\$( WIN32;NDEBUG;_WINDOWS;VALVE_DLL;%(PreprocessorDefinitions) ..\..\ricochet\dlls;..\..\engine;..\..\common;..\..\public;..\..\game_shared;..\..\ricochet\pm_shared;..\..\ricochet;%(AdditionalIncludeDirectories) MultiThreaded + OnlyExplicitInline Windows