Merge remote-tracking branch 'develop' into 8.4.0-dev

tobil4sk · tobil4sk · commit 92ceaa413728 · 2026-01-11T11:59:24.000Z
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -274,6 +274,19 @@ jobs:
           lime create SimpleAudio -verbose -nocolor
           lime build SimpleAudio windows -release -verbose -nocolor
 
+      - name: Rebuild Lime (Windows, Mingw)
+        run: |
+          rm ndll/Windows64/*
+          lime rebuild windows -Dmingw -D MINGW_ROOT=C:\mingw64 -64 -clean -release -nocolor -verbose -nocffi
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: Windows64-MinGW-NDLL
+          path: |
+            ndll/Windows64/
+            !**/.gitignore
+          if-no-files-found: error
+
   android:
     runs-on: ubuntu-22.04
     strategy:
diff --git a/project/Build.xml b/project/Build.xml
@@ -447,11 +447,14 @@
 				<lib name="comdlg32.lib" />
 				<lib name="setupapi.lib" />
 
+				<lib name="bcrypt.lib" if="LIME_CURL" />
+
 				<lib name="usp10.lib" if="LIME_HARFBUZZ" />
 				<lib name="rpcrt4.lib" if="LIME_HARFBUZZ" />
 				<lib name="dwrite.lib" if="LIME_HARFBUZZ" />
 
-				<lib name="comsuppw.lib" unless="winrt" />
+				<lib name="comsuppw.lib" unless="winrt || mingw" />
+				<lib name="wbemuuid.lib" />
 
 				<lib name="D3D11.lib" if="winrt" />
 				<lib name="RuntimeObject.lib" if="winrt" />
diff --git a/project/include/system/System.h b/project/include/system/System.h
@@ -90,7 +90,7 @@ namespace lime {
 }
 
 
-#ifndef HX_WINDOWS
+#if !defined(HX_WINDOWS) || defined(__MINGW32__)
 #include <stdint.h>
 #else
 
diff --git a/project/lib/custom/cairo/configs/windows/config.h b/project/lib/custom/cairo/configs/windows/config.h
@@ -44,13 +44,15 @@
 // #define CAIRO_HAS_DLSYM 1
 
 
+#ifdef __MINGW32__
 // #define HAVE_BYTESWAP_H 1
 // #define HAVE_INTTYPES_H 1
-// #define HAVE_STDINT_H 1
+#define HAVE_STDINT_H 1
 // #define HAVE_SYS_INT_TYPES_H 1
 // #define HAVE_UNISTD_H 1
 // #define HAVE_UINT128_T 1
-// #define HAVE_UINT64_T 1
+#define HAVE_UINT64_T 1
+#endif
 
 
 // #define HAVE_INTEL_ATOMIC_PRIMITIVES 1
diff --git a/project/lib/custom/openal/include/config-windows-x86.h b/project/lib/custom/openal/include/config-windows-x86.h
@@ -12,11 +12,6 @@
 
 #include <math.h>
 
-#ifndef isfinite
-	#include <float.h>
-	#define isfinite _finite
-#endif
-
 /* Define a restrict macro for non-aliased pointers */
 #define RESTRICT __restrict
 
diff --git a/project/lib/harfbuzz-files.xml b/project/lib/harfbuzz-files.xml
@@ -15,10 +15,10 @@
 
 		<compilerflag value="-DHAVE_UNISCRIBE" if="windows" />
 		<compilerflag value="-DHAVE_DIRECTWRITE" if="windows HXCPP_M64" /> <!-- Windows 7+ -->
-		<compilerflag value="-wd4244" if="windows" />
-		<compilerflag value="-wd4267" if="windows" />
-		<compilerflag value="-D_CRT_SECURE_NO_WARNINGS" if="windows" />
-		<compilerflag value="-D_CRT_NONSTDC_NO_WARNINGS" if="windows" />
+		<compilerflag value="-wd4244" if="isMsvc" />
+		<compilerflag value="-wd4267" if="isMsvc" />
+		<compilerflag value="-D_CRT_SECURE_NO_WARNINGS" if="isMsvc" />
+		<compilerflag value="-D_CRT_NONSTDC_NO_WARNINGS" if="isMsvc" />
 
 		<compilerflag value="-DHAVE_CORETEXT" if="mac || ios" />
 		<compilerflag value="-Wno-undefined-bool-conversion" if="mac" />
diff --git a/project/lib/openal-files.xml b/project/lib/openal-files.xml
@@ -81,6 +81,12 @@
         <file name="${NATIVE_TOOLKIT_PATH}/openal/common/strutils.cpp" />
         <file name="${NATIVE_TOOLKIT_PATH}/openal/common/threads.cpp" />
 
+        <compilerflag value="-mmmx" if="linux || mac || mingw" unless="rpi || HXCPP_ARM64" />
+        <compilerflag value="-msse" if="linux || mac || mingw" unless="rpi || HXCPP_ARM64" />
+        <compilerflag value="-msse2" if="linux || mac || mingw" unless="rpi || HXCPP_ARM64" />
+        <compilerflag value="-msse3" if="linux || mac || mingw" unless="rpi || HXCPP_ARM64" />
+        <compilerflag value="-mssse3" if="linux || mac || mingw" unless="rpi || HXCPP_ARM64" />
+
         <section if="NATIVE_TOOLKIT_HAVE_SDL">
 
             <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/custom/sdl/include/" />
@@ -100,11 +106,6 @@
 
             <compilerflag value="-D_POSIX_C_SOURCE=200112L" />
             <compilerflag value="-D_XOPEN_SOURCE=500" />
-            <compilerflag value="-mmmx" unless="rpi" />
-            <compilerflag value="-msse" unless="rpi" />
-            <compilerflag value="-msse2" unless="rpi" />
-            <compilerflag value="-msse3" unless="rpi" />
-            <compilerflag value="-mssse3" unless="rpi" />
             <compilerflag value="-mfpu=neon" if="rpi" unless="HXCPP_ARM64" />
             <compilerflag value="-fcommon" />
 
@@ -118,12 +119,6 @@
 
             <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/coreaudio.cpp" />
 
-            <compilerflag value="-mmmx" unless="HXCPP_ARM64" />
-            <compilerflag value="-msse" unless="HXCPP_ARM64" />
-            <compilerflag value="-msse2" unless="HXCPP_ARM64" />
-            <compilerflag value="-msse3" unless="HXCPP_ARM64" />
-            <compilerflag value="-mssse3" unless="HXCPP_ARM64" />
-
         </section>
 
         <section if="windows">
@@ -138,9 +133,9 @@
             <compilerflag value="-D_WIN32" />
             <compilerflag value="-D_WIN32_WINNT=0x0502" />
             <compilerflag value="-Drestrict=" />
-            <compilerflag value="-D_CRT_SECURE_NO_WARNINGS" />
-            <compilerflag value="-D_CRT_NONSTDC_NO_DEPRECATE" />
-            <compilerflag value="/wd4098" />
+            <compilerflag value="-D_CRT_SECURE_NO_WARNINGS" if="isMsvc" />
+            <compilerflag value="-D_CRT_NONSTDC_NO_DEPRECATE" if="isMsvc" />
+            <compilerflag value="-wd4098" if="isMsvc" />
             <compilerflag value="-Dstrcasecmp=_stricmp" />
             <compilerflag value="-Dstrncasecmp=_strnicmp" />
 
diff --git a/project/lib/pixman-files.xml b/project/lib/pixman-files.xml
@@ -7,7 +7,10 @@
 
 	<files id="native-toolkit-pixman">
 
-		<compilerflag value="-fno-integrated-as" if="HXCPP_CLANG || NDKV20+" unless="mac || ios || NDKV22+" />
+		<section if="PIXMAN_ARM_NEON HXCPP_CLANG || PIXMAN_ARM_NEON NDKV20+">
+			<compilerflag value="-fno-integrated-as" />
+			<compilerflag value="-march=armv7-a" if="HXCPP_ARMV7" />
+		</section>
 
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/custom/pixman" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/custom/pixman/pixman" />
@@ -23,11 +26,11 @@
 
 		<compilerflag value="-I${ANDROID_NDK_ROOT}/sources/android/cpufeatures" if="android" />
 
-		<compilerflag value="-mmmx" if="linux || mac" unless="rpi || HXCPP_ARM64" />
-		<compilerflag value="-msse" if="linux || mac" unless="rpi || HXCPP_ARM64" />
-		<compilerflag value="-msse2" if="linux || mac" unless="rpi || HXCPP_ARM64" />
-		<compilerflag value="-msse3" if="linux || mac" unless="rpi || HXCPP_ARM64" />
-		<compilerflag value="-mssse3" if="linux || mac" unless="rpi || HXCPP_ARM64" />
+		<compilerflag value="-mmmx" if="linux || mac || mingw" unless="rpi || HXCPP_ARM64" />
+		<compilerflag value="-msse" if="linux || mac || mingw" unless="rpi || HXCPP_ARM64" />
+		<compilerflag value="-msse2" if="linux || mac || mingw" unless="rpi || HXCPP_ARM64" />
+		<compilerflag value="-msse3" if="linux || mac || mingw" unless="rpi || HXCPP_ARM64" />
+		<compilerflag value="-mssse3" if="linux || mac || mingw" unless="rpi || HXCPP_ARM64" />
 
 		<compilerflag value="-Wno-attributes" if="android" />
 		<compilerflag value="-Wno-tautological-constant-out-of-range-compare" if="mac || ios || tvos" />
diff --git a/project/src/backend/sdl/SDLWindow.cpp b/project/src/backend/sdl/SDLWindow.cpp
@@ -6,7 +6,7 @@
 
 #ifdef HX_WINDOWS
 #include <SDL_syswm.h>
-#include <Windows.h>
+#include <windows.h>
 #undef CreateWindow
 #endif
 
diff --git a/project/src/graphics/opengl/OpenGL.h b/project/src/graphics/opengl/OpenGL.h
@@ -76,7 +76,7 @@
 //#define LIME_GLES3_API
 #include <windows.h>
 #ifndef NATIVE_TOOLKIT_SDL_ANGLE
-#include <gl/GL.h>
+#include <GL/gl.h>
 #endif
 
 // typedef ptrdiff_t GLsizeiptrARB;
diff --git a/project/src/system/System.cpp b/project/src/system/System.cpp
@@ -4,7 +4,7 @@
 #include <wbemidl.h>
 #include <comutil.h>
 #pragma comment(lib, "wbemuuid.lib")
-#include <Windows.h>
+#include <windows.h>
 #endif
 
 #include <system/System.h>
@@ -124,7 +124,7 @@ namespace lime {
 
 		}
 
-		hres = pSvc->ExecQuery (bstr_t ("WQL"), query, WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY, NULL, &pEnumerator);
+		hres = pSvc->ExecQuery (bstr_t (L"WQL"), query, WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY, NULL, &pEnumerator);
 
 		if (FAILED (hres)) {
 
@@ -164,7 +164,7 @@ namespace lime {
 	std::wstring* System::GetDeviceModel () {
 
 		#if defined (HX_WINDOWS) && !defined (HX_WINRT)
-		return GetWMIValue (bstr_t ("SELECT * FROM Win32_ComputerSystemProduct"), L"Version");
+		return GetWMIValue (bstr_t (L"SELECT * FROM Win32_ComputerSystemProduct"), bstr_t (L"Version"));
 		#endif
 
 		return NULL;
@@ -175,7 +175,7 @@ namespace lime {
 	std::wstring* System::GetDeviceVendor () {
 
 		#if defined (HX_WINDOWS) && !defined (HX_WINRT)
-		return GetWMIValue (bstr_t ("SELECT * FROM Win32_ComputerSystemProduct"), L"Vendor");
+		return GetWMIValue (bstr_t (L"SELECT * FROM Win32_ComputerSystemProduct"), bstr_t (L"Vendor"));
 		#endif
 
 		return NULL;
@@ -186,7 +186,7 @@ namespace lime {
 	std::wstring* System::GetPlatformLabel () {
 
 		#if defined (HX_WINDOWS) && !defined (HX_WINRT)
-		return GetWMIValue (bstr_t ("SELECT * FROM Win32_OperatingSystem"), L"Caption");
+		return GetWMIValue (bstr_t (L"SELECT * FROM Win32_OperatingSystem"), bstr_t (L"Caption"));
 		#endif
 
 		return NULL;
@@ -204,7 +204,7 @@ namespace lime {
 	std::wstring* System::GetPlatformVersion () {
 
 		#if defined (HX_WINDOWS) && !defined (HX_WINRT)
-		return GetWMIValue (bstr_t ("SELECT * FROM Win32_OperatingSystem"), L"Version");
+		return GetWMIValue (bstr_t (L"SELECT * FROM Win32_OperatingSystem"), bstr_t (L"Version"));
 		#endif
 
 		return NULL;
@@ -420,4 +420,4 @@ size_t _mbsrtowcs(wchar_t * ws, const char **src, size_t wn, mbstate_t *st)
 	return -1;
 }
 
-#endif
+#endif
diff --git a/src/lime/system/JNI.hx b/src/lime/system/JNI.hx
@@ -384,7 +384,7 @@ class JNIMethod
 	```
 **/
 // Haxe 3 can't parse "target.threaded" inside parentheses.
-#if !doc_gen
+#if !(doc_gen || macro)
 #if target.threaded
 @:autoBuild(lime.system.JNI.JNISafetyTools.build())
 #elseif (cpp || neko)
diff --git a/templates/cpp/static/BuildMain.xml b/templates/cpp/static/BuildMain.xml
@@ -2,6 +2,8 @@
 
 	<include name="${HXCPP}/build-tool/BuildCommon.xml" />
 
+	<set name="no_shared_libs" value="1" if="mingw" />
+
 	<include name="${HXCPP}/project/thirdparty/mbedtls-files.xml" noerror="true" />
 	<set name="HAS_HXCPP_MBEDTLS_FILES" value="1" if="MBEDTLS_DIR" />
 	<include name="${HXCPP}/src/hx/libs/ssl/Build.xml" unless="HAS_HXCPP_MBEDTLS_FILES" />
@@ -36,7 +38,8 @@
 			<lib name="wldap32.lib" />
 			<lib name="shell32.lib" />
 			<lib name="comdlg32.lib" />
-			<lib name="comsuppw.lib" />
+			<lib name="wbemuuid.lib" />
+			<lib name="comsuppw.lib" unless="mingw" />
 			<lib name="usp10.lib" />
 			<lib name="rpcrt4.lib" />
 			<lib name="dwrite.lib" />
diff --git a/tools/platforms/WindowsPlatform.hx b/tools/platforms/WindowsPlatform.hx
@@ -802,7 +802,7 @@ class WindowsPlatform extends PlatformTarget
 
 				if (!targetFlags.exists("32") && !targetFlags.exists("x86_32")
 					&& System.hostArchitecture == X64
-					&& (command != "rebuild" || targetType == "cpp" || targetType == "winrt"))
+					&& (command != "rebuild" || targetType == "cpp" || targetType == "neko" || targetType == "winrt"))
 				{
 					if (targetType == "winrt")
 					{
@@ -967,12 +967,12 @@ class WindowsPlatform extends PlatformTarget
 
 			var msvc19 = true;
 
-			if ((!hasVSCommunity && vs140 == null) || (hxcppMSVC != null && hxcppMSVC != vs140))
+			if (project.defines.exists("mingw") || (!hasVSCommunity && vs140 == null) || (hxcppMSVC != null && hxcppMSVC != vs140))
 			{
 				msvc19 = false;
 			}
 
-			var suffix = (msvc19 ? "-19.lib" : ".lib");
+			var suffix = (msvc19 ? "-19" : "") + "${LIBEXT}";
 
 			for (i in 0...project.ndlls.length)
 			{

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ namespace lime {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`
`93`		`-#ifndef HX_WINDOWS`
	`93`	`+#if !defined(HX_WINDOWS) \|\| defined(__MINGW32__)`
`94`	`94`	`#include <stdint.h>`
`95`	`95`	`#else`
`96`	`96`