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/ccache-action@v1.2
-    
+
     - name: Compile ffmpeg
       run: |
         cd ffmpeg && ./linux_x86-64.sh
@@ -399,3 +399,36 @@ 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 \
+          -DUSE_LIBNX:BOOL=TRUE \
+          -DUSE_FFMPEG:BOOL=FALSE \
+          -DUSE_DISCORD:BOOL=FALSE \
+          -DUSE_MINIUPNPC:BOOL=FALSE \
+          -DUSE_ARMIPS:BOOL=FALSE \
+          -DCMAKE_COLOR_DIAGNOSTICS:BOOL=TRUE \
+          ..
+        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

@@ -173,7 +173,7 @@ option(UNITTEST "Set to ON to generate the unittest target" ${UNITTEST})
 option(SIMULATOR "Set to ON when targeting an x86 simulator of an ARM platform" ${SIMULATOR})
 option(LIBRETRO "Set to ON to generate the libretro target" OFF)
 # :: Options
-option(USE_LIBNX "Set to ON to build for Switch(libnx)" OFF)
+option(USE_LIBNX "Set to ON to build for Switch (libnx)" OFF)
 option(USE_FFMPEG "Build with FFMPEG support" ON)
 option(USE_DISCORD "Build with Discord support" ON)
 option(USE_MINIUPNPC "Build with miniUPnPc support" ON)
@@ -221,12 +221,21 @@ endif()
 
 if(LIBRETRO)
 	add_definitions(-D__LIBRETRO__)
-	add_definitions(-DGLEW_NO_GLU)
+	set(GLEW_NO_GLU ON)
 	if(NOT MSVC)
 		add_compile_options(-fPIC)
 	endif()
 endif()
 
+if (USE_LIBNX)
+	set(GLEW_NO_GLU ON)
+	add_definitions(-DLUA_32BITS)
+endif()
+
+if (GLEW_NO_GLU)
+	add_definitions(-DGLEW_NO_GLU)
+endif()
+
 if(ANDROID)
 	set(MOBILE_DEVICE ON)
 	set(USING_GLES2 ON)
@@ -1468,7 +1477,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()

CMakePresets.json

@@ -1,5 +1,5 @@
 {
-    "version": 2,
+    "version": 8,
     "configurePresets": [
         {
             "name": "gcc-debug",
@@ -18,6 +18,23 @@
                 "CMAKE_BUILD_TYPE": "Debug",
                 "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
             }
+        },
+        {
+            "name": "libnx-debug",
+            "hidden": false,
+            "generator": "Ninja",
+            "binaryDir": "build-libnx-debug",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+                "CMAKE_TOOLCHAIN_FILE": "$env{DEVKITPRO}/cmake/Switch.cmake",
+                "USE_LIBNX": true,
+                "USE_FFMPEG": false,
+                "USE_DISCORD": false,
+                "USE_MINIUPNPC": false,
+                "USE_ARMIPS": false,
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "YES",
+                "CMAKE_COLOR_DIAGNOSTICS": "YES"
+            }
         }
     ]
 }

Common/Arm64Emitter.h

@@ -20,6 +20,9 @@
 #ifdef FMIN
 #undef FMIN
 #endif
+#ifdef BIT
+#undef BIT
+#endif
 
 namespace Arm64Gen
 {

Common/CommonTypes.h

@@ -49,6 +49,7 @@ typedef signed __int64 s64;
 #define Framebuffer _Framebuffer
 #define Waitable _Waitable
 #define ThreadContext _ThreadContext
+#define BreakReason _BreakReason
 #include <switch.h>
 // Cleanup
 #undef KEY_UP
@@ -57,6 +58,7 @@ typedef signed __int64 s64;
 #undef Framebuffer
 #undef Waitable
 #undef ThreadContext
+#undef BreakReason
 
 // Conflicting types with libnx
 #ifndef _u64

Common/MemArenaHorizon.cpp

@@ -67,10 +67,10 @@ u8 *MemArena::Find4GBBase() {
 	memorySrcBase = (uintptr_t)memalign(0x1000, 0x10000000);
 
 	if (!memoryBase)
-		memoryBase = (uintptr_t)virtmemReserve(0x10000000);
+		memoryBase = (uintptr_t)virtmemFindAslr(0x10000000, 0x1000);
 
 	if (!memoryCodeBase)
-		memoryCodeBase = (uintptr_t)virtmemReserve(0x10000000);
+		memoryCodeBase = (uintptr_t)virtmemFindAslr(0x10000000, 0x1000);
 
 	if (R_FAILED(svcMapProcessCodeMemory(envGetOwnProcessHandle(), (u64)memoryCodeBase, (u64)memorySrcBase, 0x10000000)))
 		printf("Failed to map memory...\n");

Common/MemoryUtil.h

@@ -21,10 +21,11 @@
 #ifndef __SWITCH__
 #include <sys/mman.h>
 #else
-#include <switch.h>
+//#include <switch.h>
 #endif // !__SWITCH__
 #endif
-#include <stdint.h>
+#include <cstdint>
+#include <cstddef>
 
 // Returns true if we need to avoid setting both writable and executable at the same time (W^X)
 bool PlatformIsWXExclusive();

Common/Net/SocketCompat.h

@@ -13,7 +13,9 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/select.h>
+#if !PPSSPP_PLATFORM(SWITCH)
 #include <sys/mman.h>
+#endif
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>

Common/StringUtils.cpp

@@ -15,20 +15,19 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include <cstring>
-
 #include "ppsspp_config.h"
 
+#if PPSSPP_PLATFORM(SWITCH)
+#define _GNU_SOURCE
+#endif
+
 #ifdef _WIN32
 #include "Common/CommonWindows.h"
 #endif
 
-#if PPSSPP_PLATFORM(SWITCH)
-#define _GNU_SOURCE
 #include <cstdio>
-#endif
-
 #include <cstdarg>
+#include <cstring>
 
 #include <string>
 #include <sstream>

Common/Thread/ThreadUtil.cpp

@@ -57,8 +57,10 @@ void RegisterAttachDetach(AttachDetachFunc attach, AttachDetachFunc detach) {
 #include <pthread.h>
 #include <sys/types.h>
 #include <unistd.h>
+#if !PPSSPP_PLATFORM(SWITCH)
 #include <sys/syscall.h>
 #endif
+#endif
 
 #if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__)
 #include <pthread_np.h>