Merge branch 'main' into 12.0-development

src/common/android.cpp

@@ -867,10 +867,9 @@ void *getIOFromFD(int fd)
 
 const char *getArg0()
 {
-	static PHYSFS_AndroidInit androidInit = {
-		SDL_AndroidGetJNIEnv(),
-		SDL_AndroidGetActivity()
-	};
+	static PHYSFS_AndroidInit androidInit = {nullptr, nullptr};
+	androidInit.jnienv = SDL_AndroidGetJNIEnv();
+	androidInit.context = SDL_AndroidGetActivity();
 	return (const char *) &androidInit;
 }
 

src/common/config.h

@@ -102,7 +102,7 @@
 #endif
 
 // DLL-stuff.
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(__MINGW32__)
 #	define LOVE_EXPORT __declspec(dllexport)
 #elif defined(__GNUC__) || defined(__clang__)
 #	define LOVE_EXPORT __attribute__((visibility("default")))
@@ -114,8 +114,10 @@
 #ifndef LOVE_WINDOWS_UWP
 #	define LOVE_LEGENDARY_CONSOLE_IO_HACK
 #endif // LOVE_WINDOWS_UWP
+#ifndef __MINGW32__
 #	define NOMINMAX
 #endif
+#endif
 
 #if defined(LOVE_MACOS) || defined(LOVE_IOS)
 #	define LOVE_LEGENDARY_APP_ARGV_HACK

src/common/ios.mm

@@ -149,6 +149,8 @@ static NSArray *getLovesInDocuments()
 			[paths addObject:path.stringByDeletingLastPathComponent];
 	}
 
+	[paths sortUsingSelector:@selector(localizedCaseInsensitiveCompare:)];
+
 	return paths;
 }