test aot support on macos

SourMesen · Jul 21, 2024 · d1ba1f4 · d1ba1f4
1 parent c774155
commit d1ba1f4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -133,11 +133,16 @@ jobs:
   macos:
     strategy:
       matrix:
-        compiler: [clang]
+        compiler: [clang, clang_aot]
         platform: [
           {os: macos-12, arch: x64},
           {os: macos-14, arch: arm64}
         ]
+        include:
+          - compiler: clang
+            make_flags: ""
+          - compiler: clang_aot
+            make_flags: "USE_AOT=true"
       fail-fast: false
     runs-on: ${{ matrix.platform.os }}
 
@@ -160,7 +165,7 @@ jobs:
       # forcing colours makes the log a little nicer to read.
       - name: Build Mesen
         run: |
-          make -j$(sysctl -n hw.logicalcpu)
+          make -j$(sysctl -n hw.logicalcpu) -O ${{ matrix.make_flags }}
 
       - name: Sign binary
         env:
@@ -194,5 +199,5 @@ jobs:
       - name: Upload Mesen
         uses: actions/upload-artifact@v4
         with:
-          name: Mesen (macOS - ${{ matrix.platform.os }})
+          name: Mesen (macOS - ${{ matrix.platform.os }} - ${{ matrix.compiler }})
           path: bin/osx-${{ matrix.platform.arch }}/Release/Mesen.app.zip
diff --git a/makefile b/makefile
@@ -175,7 +175,11 @@ ifeq ($(MESENOS),osx)
 	LIBEVDEVINC := 
 	LIBEVDEVSRC := 
 	FSLIB := 
-	PUBLISHFLAGS := -t:BundleApp -p:UseAppHost=true -p:RuntimeIdentifier=$(MESENPLATFORM) -p:SelfContained=true -p:PublishSingleFile=false -p:PublishReadyToRun=false
+	ifeq ($(USE_AOT),true)
+		PUBLISHFLAGS := -t:BundleApp -p:UseAppHost=true -p:RuntimeIdentifier=$(MESENPLATFORM) -p:PublishSingleFile=false -p:PublishAot=true -p:SelfContained=true
+	else
+		PUBLISHFLAGS := -t:BundleApp -p:UseAppHost=true -p:RuntimeIdentifier=$(MESENPLATFORM) -p:SelfContained=true -p:PublishSingleFile=false -p:PublishReadyToRun=false
+	endif
 endif
 
 all: ui