Skip to content

Commit b732b47

Browse files
committed
GCC: disable using intrinsics by default
1 parent 7aeca16 commit b732b47

5 files changed

Lines changed: 8 additions & 6 deletions

File tree

regamedll/engine/osconfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
#include <functional>
4949

5050
// enable SSE code only if it's enabled in compiler options
51-
#if defined(__SSE__) || defined(__SSE2__) || defined(_M_IX86_FP) || defined(_M_AMD64) || defined(_M_X64)
51+
#if (defined(REHLDS_SSE) || defined(REGAMEDLL_SSE)) && (defined(__SSE__) || defined(__SSE2__) || defined(_M_IX86_FP) || defined(_M_AMD64) || defined(_M_X64))
5252
// #error "SSE enabled"
5353
#define HAVE_SSE
5454
#endif

regamedll/msvc/ReGameDLL.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -907,7 +907,7 @@
907907
<WarningLevel>Level3</WarningLevel>
908908
<Optimization>Disabled</Optimization>
909909
<SDLCheck>true</SDLCheck>
910-
<PreprocessorDefinitions>REGAMEDLL_ADD;REGAMEDLL_API;REGAMEDLL_FIXES;REGAMEDLL_SELF;UNICODE_FIXES;REGAMEDLL_CHECKS;CLIENT_WEAPONS;USE_BREAKPAD_HANDLER;USE_QSTRING;DEDICATED;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
910+
<PreprocessorDefinitions>REGAMEDLL_ADD;REGAMEDLL_API;REGAMEDLL_SSE;REGAMEDLL_FIXES;REGAMEDLL_SELF;UNICODE_FIXES;REGAMEDLL_CHECKS;CLIENT_WEAPONS;USE_BREAKPAD_HANDLER;USE_QSTRING;DEDICATED;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
911911
<FloatingPointModel>Fast</FloatingPointModel>
912912
<AdditionalOptions>/arch:IA32 %(AdditionalOptions)</AdditionalOptions>
913913
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -943,7 +943,7 @@
943943
<WarningLevel>Level3</WarningLevel>
944944
<Optimization>Full</Optimization>
945945
<SDLCheck>true</SDLCheck>
946-
<PreprocessorDefinitions>REGAMEDLL_ADD;REGAMEDLL_API;REGAMEDLL_FIXES;REGAMEDLL_SELF;REGAMEDLL_CHECKS;UNICODE_FIXES;CLIENT_WEAPONS;USE_BREAKPAD_HANDLER;USE_QSTRING;DEDICATED;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
946+
<PreprocessorDefinitions>REGAMEDLL_ADD;REGAMEDLL_SSE;REGAMEDLL_API;REGAMEDLL_FIXES;REGAMEDLL_SELF;REGAMEDLL_CHECKS;UNICODE_FIXES;CLIENT_WEAPONS;USE_BREAKPAD_HANDLER;USE_QSTRING;DEDICATED;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
947947
<FloatingPointModel>Fast</FloatingPointModel>
948948
<AdditionalOptions>/arch:IA32 %(AdditionalOptions)</AdditionalOptions>
949949
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -988,7 +988,7 @@
988988
<WarningLevel>Level3</WarningLevel>
989989
<Optimization>Full</Optimization>
990990
<SDLCheck>true</SDLCheck>
991-
<PreprocessorDefinitions>PLAY_GAMEDLL;REGAMEDLL_SELF;REGAMEDLL_API;REGAMEDLL_CHECKS;CLIENT_WEAPONS;USE_BREAKPAD_HANDLER;USE_QSTRING;DEDICATED;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
991+
<PreprocessorDefinitions>PLAY_GAMEDLL;REGAMEDLL_SELF;REGAMEDLL_API;REGAMEDLL_SSE;REGAMEDLL_CHECKS;CLIENT_WEAPONS;USE_BREAKPAD_HANDLER;USE_QSTRING;DEDICATED;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
992992
<FloatingPointModel>Precise</FloatingPointModel>
993993
<AdditionalOptions>/arch:IA32 %(AdditionalOptions)</AdditionalOptions>
994994
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -1033,7 +1033,7 @@
10331033
<WarningLevel>Level3</WarningLevel>
10341034
<Optimization>Disabled</Optimization>
10351035
<SDLCheck>true</SDLCheck>
1036-
<PreprocessorDefinitions>PLAY_GAMEDLL;REGAMEDLL_SELF;REGAMEDLL_CHECKS;REGAMEDLL_API;CLIENT_WEAPONS;USE_BREAKPAD_HANDLER;USE_QSTRING;DEDICATED;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1036+
<PreprocessorDefinitions>PLAY_GAMEDLL;REGAMEDLL_SELF;REGAMEDLL_CHECKS;REGAMEDLL_API;REGAMEDLL_SSE;CLIENT_WEAPONS;USE_BREAKPAD_HANDLER;USE_QSTRING;DEDICATED;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
10371037
<FloatingPointModel>Precise</FloatingPointModel>
10381038
<AdditionalOptions>/arch:IA32 %(AdditionalOptions)</AdditionalOptions>
10391039
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

shared_gcc.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ rootProject.ext.createGccConfig = { boolean release, BinaryKind binKind ->
2727
)
2828
)
2929
} else {
30-
//debug
30+
// debug
3131
cfg = new GccToolchainConfig(
3232
compilerOptions: new GccToolchainConfig.CompilerOptions(
3333
optimizationLevel: OptimizationLevel.DISABLE,

shared_icc.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ rootProject.ext.createIccConfig = { boolean release, BinaryKind binKind ->
6060
)
6161
}
6262

63+
cfg.singleDefines('REGAMEDLL_SSE')
6364
cfg.singleDefines('LINUX', '_LINUX')
6465
return cfg
6566
}

shared_msvc.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ rootProject.ext.createMsvcConfig = { boolean release, BinaryKind binKind ->
129129

130130
cfg.compilerOptions.args "/FS", "/I${kitPath}Include/${ucrtVersion}/ucrt";
131131
cfg.linkerOptions.args("/LIBPATH:${kitPath}Lib/${ucrtVersion}/ucrt/x86");
132+
cfg.singleDefines('REGAMEDLL_SSE')
132133

133134
return cfg
134135
}

0 commit comments

Comments
 (0)