Create Cemu .app bundle for macOS (#364 )

Make controller button code thread-safe (#405 )
* Refactor spinlock to meet Lockable requirements * Input: Refactor button code and make it thread-safe
2026-07-06 00:19:59 -07:00 · 2022-10-23 16:58:28 +02:00 · 2022-10-23 15:47:42 +02:00 · 2022-10-23 14:03:51 +02:00 · 2022-10-23 13:06:20 +02:00 · 2022-10-21 12:39:26 +02:00
290 changed files with 989 additions and 1308 deletions
@@ -162,6 +162,8 @@ jobs:
      with:
        name: cemu-bin-windows-x64
        path: ./bin/Cemu.exe
+
+
  build-macos:
    runs-on: macos-12
    steps:
@@ -213,7 +215,7 @@ jobs:
      run: |
        mkdir build
        cd build
-        cmake .. ${{ env.BUILD_FLAGS }} -DCMAKE_BUILD_TYPE=${{ env.BUILD_MODE }} -DCMAKE_C_COMPILER=/usr/local/opt/llvm@14/bin/clang -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm@14/bin/clang++ -G Ninja
+        cmake .. ${{ env.BUILD_FLAGS }} -DCMAKE_BUILD_TYPE=${{ env.BUILD_MODE }} -DPORTABLE=OFF -DMACOS_BUNDLE=ON -DCMAKE_C_COMPILER=/usr/local/opt/llvm@14/bin/clang -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm@14/bin/clang++ -G Ninja
        
    - name: "Build Cemu"
      run: |
@@ -221,11 +223,20 @@ jobs:

    - name: Prepare artifact
      if: ${{ inputs.deploymode == 'release' }}
-      run: chmod a+x bin/Cemu_release && mv bin/Cemu_release bin/Cemu
+      run: |
+        mkdir bin/Cemu_app
+        mv bin/Cemu_release.app bin/Cemu_app/Cemu.app
+        mv bin/Cemu_app/Cemu.app/Contents/MacOS/Cemu_release bin/Cemu_app/Cemu.app/Contents/MacOS/Cemu
+        sed -i '' 's/Cemu_release/Cemu/g' bin/Cemu_app/Cemu.app/Contents/Info.plist
+        chmod a+x bin/Cemu_app/Cemu.app/Contents/MacOS/Cemu
+        ln -s /Applications bin/Cemu_app/Applications
+        hdiutil create ./bin/tmp.dmg -ov -volname "Cemu" -fs HFS+ -srcfolder "./bin/Cemu_app"
+        hdiutil convert ./bin/tmp.dmg -format UDZO -o bin/Cemu.dmg
+        rm bin/tmp.dmg
              
    - name: Upload artifact
      uses: actions/upload-artifact@v3
      if: ${{ inputs.deploymode == 'release' }}
      with:
        name: cemu-bin-macos-x64
-        path: ./bin/Cemu
+        path: ./bin/Cemu.dmg
@@ -64,13 +64,7 @@ jobs:
          rm -r ./${{ env.CEMU_FOLDER_NAME }}
          
      - name: Create release from macos-bin
-        run: |
-          ls ./
-          ls ./bin/
-          cp -R ./bin ./${{ env.CEMU_FOLDER_NAME }}
-          mv cemu-bin-macos-x64/Cemu ./${{ env.CEMU_FOLDER_NAME }}/Cemu
-          zip -9 -r upload/cemu-${{ env.CEMU_VERSION }}-macos-12-x64.zip ${{ env.CEMU_FOLDER_NAME }}
-          rm -r ./${{ env.CEMU_FOLDER_NAME }}
+        run: cp cemu-bin-macos-x64/Cemu.dmg upload/cemu-${{ env.CEMU_VERSION }}-macos-12-x64.dmg

      - name: Create release
        run: |
@@ -68,13 +68,7 @@ jobs:
          rm -r ./${{ env.CEMU_FOLDER_NAME }}
          
      - name: Create release from macos-bin
-        run: |
-          ls ./
-          ls ./bin/
-          cp -R ./bin ./${{ env.CEMU_FOLDER_NAME }}
-          mv cemu-bin-macos-x64/Cemu ./${{ env.CEMU_FOLDER_NAME }}/Cemu
-          zip -9 -r upload/cemu-${{ env.CEMU_VERSION }}-macos-12-x64.zip ${{ env.CEMU_FOLDER_NAME }}
-          rm -r ./${{ env.CEMU_FOLDER_NAME }}
+        run: cp cemu-bin-macos-x64/Cemu.dmg upload/cemu-${{ env.CEMU_VERSION }}-macos-12-x64.dmg
          
      - name: Create release
        run: |
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.21.1)

 option(ENABLE_VCPKG "Enable the vcpkg package manager" ON)
 option(PORTABLE "All data created and maintained by Cemu will be in the directory where the executable file is located" ON)
+option(MACOS_BUNDLE "The executable when built on macOS will be created as an application bundle" OFF)
 set(EXPERIMENTAL_VERSION "" CACHE STRING "") # used by CI script to set experimental version

 if (EXPERIMENTAL_VERSION)
@@ -1,7 +1 @@
-# LEGO City Undercover (USA)
-
-[General]
-loadSharedLibraries = false
-
-[Graphics]
-GPUBufferCacheAccuracy = 0
+# LEGO City Undercover (USA)
@@ -1,7 +1 @@
-# LEGO City Undercover (EUR)
-
-[General]
-loadSharedLibraries = false
-
-[Graphics]
-GPUBufferCacheAccuracy = 0
+# LEGO City Undercover (EUR)
@@ -1,5 +1,4 @@
 # Monster Hunter 3(tri-)GHD Ver. (JPN)

 [Graphics]
-GPUBufferCacheAccuracy = 1
 streamoutBufferCacheSize = 48
@@ -1,7 +1,4 @@
 # Super Mario 3D World (JPN)

-[CPU]
-
 [Graphics]
 accurateShaderMul = false
-GPUBufferCacheAccuracy = 2
@@ -2,6 +2,3 @@

 [CPU]
 cpuMode = Singlecore-Recompiler
-
-[Graphics]
-GPUBufferCacheAccuracy = 2
@@ -1,7 +1 @@
-# Scribblenauts Unlimited (EUR)
-
-[General]
-loadSharedLibraries = true
-
-[Graphics]
-GPUBufferCacheAccuracy = 0
+# Scribblenauts Unlimited (EUR)
@@ -1,7 +1 @@
-# Ben 10 Omniverse (USA)
-
-[General]
-loadSharedLibraries = false
-
-[Graphics]
-GPUBufferCacheAccuracy = 0
+# Ben 10 Omniverse (USA)
@@ -1,4 +1 @@
-# Rayman Legends (USA)
-
-[Graphics]
-GPUBufferCacheAccuracy = 0
+# Rayman Legends (USA)
@@ -1,7 +1 @@
-# Scribblenauts Unlimited (US)
-
-[General]
-loadSharedLibraries = true
-
-[Graphics]
-GPUBufferCacheAccuracy = 0
+# Scribblenauts Unlimited (US)
@@ -1,4 +1 @@
-# Mass Effect 3 Special Edition (USA)
-
-[Graphics]
-GPUBufferCacheAccuracy = 0
+# Mass Effect 3 Special Edition (USA)
@@ -1,4 +1 @@
-# ZombiU (US)
-
-[Graphics]
-GPUBufferCacheAccuracy = 0
+# ZombiU (US)
@@ -1,4 +1 @@
-# 007 Legends (US)
-
-[Graphics]
-GPUBufferCacheAccuracy = 0
+# 007 Legends (US)
@@ -1,7 +1 @@
-# Cabela's Dangerous Hunts 2013 (USA)
-
-[General]
-loadSharedLibraries = false
-
-[Graphics]
-GPUBufferCacheAccuracy = 0
+# Cabela's Dangerous Hunts 2013 (USA)
@@ -2,6 +2,3 @@

 [CPU]
 cpuMode = Singlecore-Recompiler
-
-[Graphics]
-GPUBufferCacheAccuracy = 2
@@ -2,6 +2,3 @@

 [CPU]
 cpuMode = Singlecore-Recompiler
-
-[Graphics]
-GPUBufferCacheAccuracy = 2
@@ -1,4 +1 @@
-# ZombiU (EUR)
-
-[Graphics]
-GPUBufferCacheAccuracy = 0
+# ZombiU (EUR)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
emiylandGitHub	8f674933d2	Create Cemu .app bundle for macOS (#364 )	2022-10-23 16:58:28 +02:00
ExzapandGitHub	028b3f7992	Make controller button code thread-safe (#405 ) * Refactor spinlock to meet Lockable requirements * Input: Refactor button code and make it thread-safe	2022-10-23 15:47:42 +02:00
Jeremy KescherandGitHub	c40466f3a8	Fix incorrect title ID (00050000-1011000? -> 00050000-10111000) (#404 )	2022-10-23 14:03:51 +02:00
TillsunsetandGitHub	1bcc064593	Add check for "." in FSC path (#402 )	2022-10-23 13:06:20 +02:00
Squall LeonhartandGitHub	ffa213c794	Generalised game profile cleanup and corrections (#389 )	2022-10-21 12:39:26 +02:00
MythicalPlayzandGitHub	c217b3ee32	GameList: Use title name based on console language (#388 )	2022-10-21 00:17:11 +02:00
goeiecool9999andGitHub	dd1cb1cccf	Update title manager when clearing MLC path in settings (#319 )	2022-10-20 13:18:44 +02:00
goeiecool9999andGitHub	9df1325d14	Linux: Resolve backtrace symbols directly from .symtab instead of .dynsym (#385 )	2022-10-20 13:12:16 +02:00
MythicalPlayzandGitHub	271a4e4719	Fixed Discord Rich Presence not working on games that are on MLC (#383 )	2022-10-18 17:08:09 +02:00
goeiecool9999andGitHub	15b3a3f77d	Linux: Remove libpng dependency from wxwidgets (#382 )	2022-10-17 16:05:35 +02:00
ExzapandGitHub	665a34e518	Linux: Always use libpng from system (#381 ) * Always use system libpng on Linux * Remove dependency on boost-crc in DSU (reuse existing implementation)	2022-10-17 13:25:49 +02:00
MythicalPlayzandGitHub	753040f73a	Added Boot Image for Gamepad (#372 )	2022-10-17 11:26:32 +02:00
goeiecool9999andGitHub	e88d20cbfb	Fix crashes when wxWidgets tries to free stack allocated dialogs (#377 )	2022-10-16 09:02:33 +02:00
TillsunsetandGitHub	f0938e1a23	Fix CRC errors on MacOS(/Linux?) (#375 ) Fixes graphic packs (like FPS++) not working even when enabled.	2022-10-15 13:38:06 +02:00
TillsunsetandGitHub	df0e2f7881	Fix Cannot set locale to "" (#366 ) * Add en resource and change language selection for macos user that don't have US as their system region * default to English if the system language is unavailable	2022-10-15 07:20:20 +02:00