GitHub actions: Switch build

Author: xerpi

.github/workflows/build.yml

@@ -365,7 +365,7 @@ jobs:
 
   build_test_headless_alpine:
     runs-on: ubuntu-latest
-    container: 
+    container:
       image: alpine:latest
       options: --shm-size=8g
     steps:
@@ -383,7 +383,7 @@ jobs:
 
     - name: Setup ccache
       uses: hendrikmuhs/[email protected]
-    
+
     - name: Compile ffmpeg
       run: |
         cd ffmpeg && ./linux_x86-64.sh
@@ -399,3 +399,29 @@ jobs:
     - name: Execute headless tests
       run: |
         python test.py -g --graphics=software
+
+  build_switch:
+    runs-on: ubuntu-latest
+    container:
+      image: 'devkitpro/devkita64'
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    - name: Build
+      run: |
+        mkdir -p build-switch
+        cd build-switch
+        cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE=$DEVKITPRO/cmake/Switch.cmake -DCMAKE_COLOR_DIAGNOSTICS:BOOL=TRUE -DUSE_LIBNX:BOOL=TRUE -DUSE_DISCORD:BOOL=FALSE -DUSE_MINIUPNPC:BOOL=FALSE ..
+        ninja
+
+    - name: Upload artifacts
+      if: success()
+      uses: actions/upload-artifact@v4
+      with:
+        name: ppsspp-switch-build
+        path: |
+          build-switch/ppsspp.elf
+          build-switch/ppsspp.nro

CMakeLists.txt

@@ -1468,7 +1468,11 @@ else()
 		message(WARNING "Found SDL2_ttf <2.0.18 - this is too old, falling back to atlas")
 	endif()
 	if(SDL2_ttf_FOUND)
-		set(nativeExtraLibs ${nativeExtraLibs} SDL2_ttf::SDL2_ttf)
+		if(TARGET SDL2_ttf::SDL2_ttf)
+			set(nativeExtraLibs ${nativeExtraLibs} SDL2_ttf::SDL2_ttf)
+		else()
+			set(nativeExtraLibs ${nativeExtraLibs} SDL2_ttf::SDL2_ttf-static)
+		endif()
 	elseif(SDL2_ttf_PKGCONFIG_FOUND)
 		set(nativeExtraLibs ${nativeExtraLibs} PkgConfig::SDL2_ttf_PKGCONFIG)
 	endif()

Common/CommonTypes.h

@@ -58,6 +58,9 @@ typedef signed __int64 s64;
 #undef Waitable
 #undef ThreadContext
 
+// Conflicts with Arm64Emitter's BIT
+#undef BIT
+
 // Conflicting types with libnx
 #ifndef _u64
 #define u64 _u64