diff --git a/premake4.lua b/premake4.lua
index 924472c96..aea3708c5 100644
--- a/premake4.lua
+++ b/premake4.lua
@@ -1319,6 +1319,11 @@ solution "eepp"
 				buildoptions{ "/bigobj" }
 			end
 
+			if os.is("windows") and not is_vs() then
+				buildoptions{ "-Wa,-mbig-obj" }
+				linkoptions { "-Wl,--export-all-symbols" }
+			end
+
 		project "SheenBidi-static"
 			kind "StaticLib"
 			language "C"
diff --git a/premake5.lua b/premake5.lua
index cda7efffa..5941e83f8 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -1221,6 +1221,9 @@ workspace "eepp"
 			target_dir_thirdparty()
 			filter "action:vs*"
 				buildoptions{ "/bigobj" }
+			filter { "system:windows", "action:not vs*" }
+				buildoptions{ "-Wa,-mbig-obj" }
+				linkoptions { "-Wl,--export-all-symbols" }
 
 		project "SheenBidi-static"
 			kind "StaticLib"
diff --git a/projects/mingw32/make.sh b/projects/mingw32/make.sh
index c32940fe4..1c5ece576 100755
--- a/projects/mingw32/make.sh
+++ b/projects/mingw32/make.sh
@@ -67,8 +67,13 @@ fi
 if [[ "$CONFIG" == *"arm64"* ]]; then
 bash ./build_sdl2.sh --arch=arm64 || exit 1
 else
-export CC=x86_64-w64-mingw32-gcc-posix
-export CXX=x86_64-w64-mingw32-g++-posix
+if command -v x86_64-w64-mingw32-gcc-posix &> /dev/null; then
+  export CC=x86_64-w64-mingw32-gcc-posix
+  export CXX=x86_64-w64-mingw32-g++-posix
+else
+  export CC=x86_64-w64-mingw32-gcc
+  export CXX=x86_64-w64-mingw32-g++
+fi
 fi
 
 cd ../../make/windows/ || exit