Merge pull request #614 from s1lentq/fligthrec-move-to-debug

Move REHLDS_FLIGHT_REC macro to debug build
dreamstalker · May 13, 2018 · 87a2d17 · 87a2d17
2 parents 87a10a1 + 7fa5745
commit 87a2d17
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/rehlds/build.gradle b/rehlds/build.gradle
@@ -114,6 +114,7 @@ void setupToolchain(NativeBinarySpec b) {
 	boolean unitTestExecutable = b.component.name.endsWith('_tests')
 	boolean swdsLib = b.name.toLowerCase().contains('swds')
 	boolean rehldsFixes = b.flavor.name.contains('rehldsFixes')
+	boolean release = b.buildType.name.toLowerCase() == 'release';
 
 	ToolchainConfig cfg = rootProject.createToolchainConfig(b)
 	cfg.projectInclude(project, '', '/public/rehlds', '/engine', '/common', '/pm_shared', '/rehlds', '/testsuite', '/hookers', '/public')
@@ -125,7 +126,7 @@ void setupToolchain(NativeBinarySpec b) {
 	}
 	b.lib LazyNativeDepSet.create(dep_bzip2, 'bzip2', b.buildType.name, true)
 
-	cfg.singleDefines 'USE_BREAKPAD_HANDLER', 'DEDICATED', 'SWDS', 'REHLDS_SELF', 'REHLDS_OPT_PEDANTIC', 'REHLDS_FLIGHT_REC', 'REHLDS_API'
+	cfg.singleDefines 'USE_BREAKPAD_HANDLER', 'DEDICATED', 'SWDS', 'REHLDS_SELF', 'REHLDS_OPT_PEDANTIC', 'REHLDS_API'
 
 	if (cfg instanceof MsvcToolchainConfig) {
 		cfg.compilerOptions.pchConfig = new MsvcToolchainConfig.PrecompiledHeadersConfig(
@@ -187,6 +188,10 @@ void setupToolchain(NativeBinarySpec b) {
 		cfg.singleDefines 'REHLDS_FIXES', 'REHLDS_SSE', 'REHLDS_JIT', 'REHLDS_CHECKS', 'HAVE_OPT_STRTOOLS'
 	}
 
+	if (!release) {
+		cfg.singleDefines 'REHLDS_FLIGHT_REC'
+	}
+
 	ToolchainConfigUtils.apply(project, cfg, b)
 
 	GradleCppUtils.onTasksCreated(project, 'postEvaluate', {

diff --git a/rehlds/msvc/ReHLDS.vcxproj b/rehlds/msvc/ReHLDS.vcxproj
@@ -766,7 +766,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>REHLDS_API;REHLDS_FLIGHT_REC;REHLDS_FIXES;REHLDS_SSE;REHLDS_OPT_PEDANTIC;REHLDS_SELF;REHLDS_CHECKS;HAVE_OPT_STRTOOLS;USE_BREAKPAD_HANDLER;DEDICATED;SWDS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>REHLDS_API;REHLDS_FIXES;REHLDS_SSE;REHLDS_OPT_PEDANTIC;REHLDS_SELF;REHLDS_CHECKS;HAVE_OPT_STRTOOLS;USE_BREAKPAD_HANDLER;DEDICATED;SWDS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <AdditionalOptions>/arch:IA32 %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeader>Use</PrecompiledHeader>