Merge branch 'develop' into 8.3.0-Dev

LICENSE.md

@@ -1,7 +1,7 @@
 MIT License
 ===========
 
-Copyright (c) 2013-2024 Joshua Granick and other Lime contributors
+Copyright (c) 2013-2025 Joshua Granick and other Lime contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

NOTICE.md

@@ -2,7 +2,7 @@ Notices
 =======
 
 ### Lime
-Copyright (c) 2013-2024 Joshua Granick and other Lime contributors
+Copyright (c) 2013-2025 Joshua Granick and other Lime contributors
 
 This product bundles cairo 1.15.2, which is available under an
 "MPL 1.1" license. For details, see [project/lib/cairo/](project/lib).

project/lib/custom/jpeg/jconfigint.h

@@ -23,10 +23,10 @@
 #define VERSION  "2.0.7"
 
 /* The size of `size_t', as computed by sizeof. */
-#if defined(RASPBERRYPI)
-#define SIZEOF_SIZE_T  4
-#else
+#if (__WORDSIZE == 64) || defined(_WIN64)
 #define SIZEOF_SIZE_T  8
+#else
+#define SIZEOF_SIZE_T  4
 #endif
 
 /* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == sizeof(size_t). */

src/lime/tools/FlashHelper.hx

@@ -167,7 +167,7 @@ class FlashHelper
 
 				var frameData = frameDataWriter.getBytes();
 
-				var snd:format.swf.Sound =
+				var snd:format.swf.Data.Sound =
 					{
 						sid: cid,
 						format: SFMP3,
@@ -255,7 +255,7 @@ class FlashHelper
 					{
 						var sampleCount = Std.int(wav.data.length / (hdr.bitsPerSample / 8));
 
-						var snd:format.swf.Sound =
+						var snd:format.swf.Data.Sound =
 							{
 								sid: cid,
 								format: SFLittleEndianUncompressed,

src/lime/tools/Keystore.hx

@@ -26,9 +26,9 @@ class Keystore
 		if (keystore != null)
 		{
 			if (keystore.path != null && keystore.path != "") path = keystore.path;
-			if (keystore.password != null) path = keystore.password;
-			if (keystore.alias != null) path = keystore.alias;
-			if (keystore.aliasPassword != null) path = keystore.aliasPassword;
+			if (keystore.password != null) password = keystore.password;
+			if (keystore.alias != null) alias = keystore.alias;
+			if (keystore.aliasPassword != null) aliasPassword = keystore.aliasPassword;
 		}
 	}
 }

templates/android/template/app/src/main/java/org/haxe/lime/GameActivity.java

@@ -3,6 +3,7 @@ package org.haxe.lime;
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.content.res.AssetManager;
 import android.net.Uri;
 import android.os.Build;
@@ -16,6 +17,7 @@ import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import android.view.View;
 import android.webkit.MimeTypeMap;
+import android.Manifest;
 import org.haxe.extension.Extension;
 import org.libsdl.app.SDLActivity;
 
@@ -110,7 +112,13 @@ public class GameActivity extends SDLActivity {
 		super.onCreate (state);
 
 		assetManager = getAssets ();
-		vibrator = (Vibrator)mSingleton.getSystemService (Context.VIBRATOR_SERVICE);
+
+		if (checkSelfPermission(Manifest.permission.VIBRATE) == PackageManager.PERMISSION_GRANTED) {
+
+			vibrator = (Vibrator)mSingleton.getSystemService (Context.VIBRATOR_SERVICE);
+
+		}
+
 		handler = new Handler ();
 
 		Extension.assetManager = assetManager;

tools/CommandLineTools.hx

@@ -1514,6 +1514,11 @@ class CommandLineTools
 				target = System.hostPlatform;
 				targetFlags.set("cpp", "");
 
+				if (target == Platform.MAC)
+				{
+					overrides.haxedefs.set("macos", "");
+				}
+
 			case "neko":
 				target = System.hostPlatform;
 				targetFlags.set("neko", "");