Merge pull request #3 from FunkinCrew/dev-funkin-arm64

Dev funkin arm64

.gitconfig

@@ -0,0 +1,2 @@
+[transfer]
+ fsckObjects = false

.github/workflows/main.yml

@@ -120,7 +120,8 @@ jobs:
 
       - name: Install Haxe dependencies
         run: |
-          haxelib install hxcpp 4.2.1 --quiet
+          curl -LO https://github.com/HaxeFoundation/hxcpp/releases/download/v4.3.45/hxcpp-4.3.45.zip
+          haxelib install ./hxcpp-4.3.45.zip --quiet
           haxelib install format --quiet
           haxelib install hxp --quiet
 
@@ -137,6 +138,7 @@ jobs:
       - name: Rebuild Lime (macOS)
         run: |
           lime rebuild macos -clean -release -64 -nocolor -verbose -nocffi
+          lime rebuild macos -clean -release -arm64 -nocolor -verbose -nocffi
           lime rebuild hl -clean -release -nocolor -verbose -nocffi
 
       - uses: actions/upload-artifact@v3
@@ -147,6 +149,14 @@ jobs:
             !**/.gitignore
           if-no-files-found: error
 
+      - uses: actions/upload-artifact@v3
+        with:
+          name: MacArm64-NDLL
+          path: |
+            ndll/MacArm64/
+            !**/.gitignore
+          if-no-files-found: error
+
       - uses: actions/upload-artifact@v3
         with:
           name: Mac64-Hashlink
@@ -466,6 +476,11 @@ jobs:
           name: Mac64-NDLL
           path: ndll/Mac64/
 
+      - uses: actions/download-artifact@v3
+        with:
+          name: MacArm64-NDLL
+          path: ndll/MacArm64/
+
       - uses: actions/download-artifact@v3
         with:
           name: Windows-NDLL

.gitmodules

@@ -46,6 +46,7 @@
 	path = project/lib/cairo
 	url = https://gitlab.freedesktop.org/cairo/cairo.git
 	shallow = true
+	depth = 1
 [submodule "project/lib/pixman"]
 	path = project/lib/pixman
 	url = https://gitlab.freedesktop.org/pixman/pixman.git

dependencies/extension-api/build.gradle

@@ -12,6 +12,7 @@ buildscript {
 apply plugin: 'com.android.library'
 
 android {
+	namespace 'org.haxe.extension'
 	compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
 	buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
 

dependencies/extension-api/src/main/AndroidManifest.xml

@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.haxe.extension" >
-
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />

include.xml

@@ -91,7 +91,7 @@
 		<dependency name="extension-api" path="dependencies/extension-api" if="android" />
 
 		<dependency path="dependencies/howler.min.js" if="html5 howlerjs" embed="true" />
-		<dependency path="dependencies/pako.min.js" if="html5" embed="true" web-worker="true" />
+		<dependency path="dependencies/pako.min.js" if="html5" embed="true" allow-web-workers="true" />
 		<dependency path="dependencies/lzma_worker-min.js" if="html5" embed="true" />
 		<dependency path="dependencies/FileSaver.min.js" if="html5" embed="true" />
 		<dependency path="dependencies/webgl-debug.js" if="html5 webgl-debug" embed="true" />

ndll/MacArm64/lime-debug.ndll.hash

@@ -0,0 +1 @@
+907250ca724f8f1ec24b393224d612d7

ndll/MacArm64/lime.ndll.hash

@@ -0,0 +1 @@
+2646d126dfb43dda40c6c30682a6ffa6

project/lib/custom/jpeg/jconfig.h

@@ -19,7 +19,9 @@
 #define MEM_SRCDST_SUPPORTED 1
 
 /* Use accelerated SIMD routines. */
+#ifndef __ANDROID__
 #define WITH_SIMD 1
+#endif
 
 /*
  * Define BITS_IN_JSAMPLE as either
@@ -67,9 +69,10 @@
 #endif
 
 /* If rpcndr.h has defined boolean, jmorecfg.h should not. */
-#ifdef __RPCNDR_H__
-#define HAVE_BOOLEAN
+#ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */
+typedef unsigned char boolean;
 #endif
+#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */