diff --git a/ee_frontend/CMakeLists.txt b/ee_frontend/CMakeLists.txt
index e99c61f57..003965026 100644
--- a/ee_frontend/CMakeLists.txt
+++ b/ee_frontend/CMakeLists.txt
@@ -16,7 +16,7 @@ include_directories(common/include)
 include_directories(menu/include)
 include_directories(SoundSystem)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DCLI_BUILD -DINCLUDE_ITEM_DESCRIPTIONS -DEMIT_QUIT_OPTION -DENDIANESS_AWARE -DTILED_BITMAPS -DSDLGL" )
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DCLI_BUILD -DINCLUDE_ITEM_DESCRIPTIONS -DEMIT_QUIT_OPTION -DENDIANESS_AWARE -DTILED_BITMAPS -DSDLGL -DSDL_DISABLE_IMMINTRIN_H" )
 
 find_package(SDL2 REQUIRED)
 find_package(OpenGL REQUIRED)
diff --git a/gl_frontend/CMakeLists.txt b/gl_frontend/CMakeLists.txt
index 44ee5fac1..cf4d5add7 100644
--- a/gl_frontend/CMakeLists.txt
+++ b/gl_frontend/CMakeLists.txt
@@ -16,7 +16,7 @@ include_directories(../common/include)
 include_directories(base3d/include)
 include_directories(menu/include)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DCLI_BUILD -DTILED_BITMAPS -DINCLUDE_ITEM_DESCRIPTIONS -Wall -Wextra -Wno-unused-parameter -Wno-switch -Wno-unused-variable -pedantic -g -DENDIANESS_AWARE -DEMIT_QUIT_OPTION")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DCLI_BUILD -DTILED_BITMAPS -DINCLUDE_ITEM_DESCRIPTIONS -Wall -Wextra -Wno-unused-parameter -Wno-switch -Wno-unused-variable -pedantic -g -DENDIANESS_AWARE -DEMIT_QUIT_OPTION -DSDL_DISABLE_IMMINTRIN_H")
 
 find_package(SDL2 REQUIRED)
 find_package(OpenGL REQUIRED)
diff --git a/gl_frontend/Makefile.SDL2 b/gl_frontend/Makefile.SDL2
index 9ec132815..271b87de9 100644
--- a/gl_frontend/Makefile.SDL2
+++ b/gl_frontend/Makefile.SDL2
@@ -1,19 +1,12 @@
 LDFLAGS=`sdl2-config --libs` -R/usr/pkg/lib -R/usr/X11R7/lib  -L/usr/pkg/lib -L/usr/X11R7/lib  -lm -lGL
 
 CFLAGS= `sdl2-config --cflags `  \
-    -O6 -Ofast      \
     -Ibase3d/include        \
     -Imenu/include          \
-    -funroll-loops          \
-    -fomit-frame-pointer    \
-    -fno-exceptions         \
-    -ffast-math             \
-    -flto		    \
-    --pedantic		    \
     -DCLI_BUILD \
     -I../core/include \
     -I../common/include \
-    -DINCLUDE_ITEM_DESCRIPTIONS -DTILED_BITMAPS -Wall -Wextra -Wno-unused-parameter -Wno-switch -Wno-unused-variable -pedantic -DEMIT_QUIT_OPTION -DENDIANESS_AWARE
+    -DINCLUDE_ITEM_DESCRIPTIONS -DTILED_BITMAPS -Wall -Wextra -Wno-unused-parameter -Wno-switch -Wno-unused-variable -pedantic -DEMIT_QUIT_OPTION -DENDIANESS_AWARE -DSDL_DISABLE_IMMINTRIN_H
 
 MENU_TARGET=game
 
diff --git a/mx_frontend/CMakeLists.txt b/mx_frontend/CMakeLists.txt
index 31b208c3d..92a2e8a73 100644
--- a/mx_frontend/CMakeLists.txt
+++ b/mx_frontend/CMakeLists.txt
@@ -15,7 +15,7 @@ include_directories(base3d/include)
 include_directories(common/include)
 include_directories(menu/include)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSDLSW -DCLI_BUILD -DPAGE_FLIP_ANIMATION -DINCLUDE_ITEM_DESCRIPTIONS -Wall -Wextra -pedantic -g -DENDIANESS_AWARE -DEMIT_QUIT_OPTION")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSDLSW -DCLI_BUILD -DPAGE_FLIP_ANIMATION -DINCLUDE_ITEM_DESCRIPTIONS -Wall -Wextra -pedantic -g -DENDIANESS_AWARE -DEMIT_QUIT_OPTION -DSDL_DISABLE_IMMINTRIN_H")
 
 find_package(SDL2 REQUIRED)
 
diff --git a/mx_frontend/Makefile.SDL1 b/mx_frontend/Makefile.SDL1
index 62b8821bb..f1c270b07 100644
--- a/mx_frontend/Makefile.SDL1
+++ b/mx_frontend/Makefile.SDL1
@@ -4,9 +4,6 @@ LDFLAGS=`sdl-config --libs` -lm
 CFLAGS= `sdl-config --cflags `  -g \
     -Ibase3d/include        \
     -Imenu/include          \
-    -fno-exceptions         \
-    -ffast-math             \
-    --pedantic		    \
     -DCLI_BUILD \
     -I../core/include -I../common/include -DINCLUDE_ITEM_DESCRIPTIONS -DPAGE_FLIP_ANIMATION -DENDIANESS_AWARE -DEMIT_QUIT_OPTION
 
diff --git a/mx_frontend/Makefile.SDL2 b/mx_frontend/Makefile.SDL2
index 9ccacb2de..4d62c221a 100644
--- a/mx_frontend/Makefile.SDL2
+++ b/mx_frontend/Makefile.SDL2
@@ -2,17 +2,10 @@ LDFLAGS=`sdl2-config --libs` -lm
 
 
 CFLAGS= `sdl2-config --cflags `  \
-    -O6 -Ofast      \
     -Ibase3d/include        \
     -Imenu/include          \
-    -funroll-loops          \
-    -fomit-frame-pointer    \
-    -fno-exceptions         \
-    -ffast-math             \
-    -flto		    \
-    --pedantic		    \
     -DCLI_BUILD \
-    -I../core/include -I../common/include -DINCLUDE_ITEM_DESCRIPTIONS -DPAGE_FLIP_ANIMATION -DENDIANESS_AWARE -DEMIT_QUIT_OPTION
+    -I../core/include -I../common/include -DINCLUDE_ITEM_DESCRIPTIONS -DPAGE_FLIP_ANIMATION -DENDIANESS_AWARE -DEMIT_QUIT_OPTION -DSDL_DISABLE_IMMINTRIN_H
 
 MENU_TARGET=game
 
diff --git a/my_frontend/CMakeLists.txt b/my_frontend/CMakeLists.txt
index 29c7bfbaa..3a6034db5 100644
--- a/my_frontend/CMakeLists.txt
+++ b/my_frontend/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(src ../core/src ../core/include include ../common/include
         ${SDL2_INCLUDE_DIR}
         )
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSDLW -DENDIANESS_AWARE -DEMBEDDED_DATA -DRLE_COMPRESSED_MAPS -DSUPPORTS_ROOM_TRANSITION_ANIMATION -DSUPPORTS_HACKING_MINIGAME -DTRACE_OBJECTS_OVER_FLOOR -DCAN_PICK_OBJECT_AT_ANY_DISTANCE -DRES128X128 -Wall -Wextra -pedantic -Wunused-parameter -DXRES_FRAMEBUFFER=256 -DYRES_FRAMEBUFFER=192 -ggdb3 -DEMIT_QUIT_OPTION -DENDIANESS_AWARE")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSDLW -DENDIANESS_AWARE -DEMBEDDED_DATA -DRLE_COMPRESSED_MAPS -DSUPPORTS_ROOM_TRANSITION_ANIMATION -DSUPPORTS_HACKING_MINIGAME -DTRACE_OBJECTS_OVER_FLOOR -DCAN_PICK_OBJECT_AT_ANY_DISTANCE -DRES128X128 -Wall -Wextra -pedantic -Wunused-parameter -DXRES_FRAMEBUFFER=256 -DYRES_FRAMEBUFFER=192 -ggdb3 -DEMIT_QUIT_OPTION -DENDIANESS_AWARE -DSDL_DISABLE_IMMINTRIN_H")
 
 find_package(SDL2 REQUIRED)
 
diff --git a/mz_frontend/CMakeLists.txt b/mz_frontend/CMakeLists.txt
index 26700d11d..149b2180d 100644
--- a/mz_frontend/CMakeLists.txt
+++ b/mz_frontend/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories( src ../core/src ../core/include ../common/include Engine3D
 		${SDL2_INCLUDE_DIR}
 )
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSDLSW -DRES128X128 -DSUPPORTS_HACKING_MINIGAME -DTRACE_OBJECTS_OVER_FLOOR -DCAN_PICK_OBJECT_AT_ANY_DISTANCE -DENDIANESS_AWARE")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSDLSW -DRES128X128 -DSUPPORTS_HACKING_MINIGAME -DTRACE_OBJECTS_OVER_FLOOR -DCAN_PICK_OBJECT_AT_ANY_DISTANCE -DENDIANESS_AWARE -DSDL_DISABLE_IMMINTRIN_H")
 
 find_package(SDL2 REQUIRED)