WinArm64-MSVC

.github/workflows/build.yml

@@ -128,7 +128,16 @@ jobs:
         path: artifacts
 
   build-windows:
-    runs-on: windows-2022
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: windows-2022
+            arch: x64
+          - os: windows-11-arm
+            arch: arm64
+    name: build-windows-${{ matrix.arch }}
+    runs-on: ${{ matrix.os }}
     steps:
     - name: "Checkout repo"
       uses: actions/checkout@v6
@@ -190,19 +199,19 @@ jobs:
       shell: cmd
       run: |
         cd src\resource
-        makensis /DPRODUCT_VERSION=${{ inputs.next_version_major }}.${{ inputs.next_version_minor }} installer.nsi
+        makensis /DPRODUCT_VERSION=${{ inputs.next_version_major }}.${{ inputs.next_version_minor }} /DARCH=${{ matrix.arch }} installer.nsi
 
     - name: Upload artifact
       uses: actions/upload-artifact@v6
       with:
-        name: cemu-bin-windows-x64
+        name: cemu-bin-windows-${{ matrix.arch }}
         path: ./bin/Cemu.exe
 
     - name: Upload NSIS Installer
       uses: actions/upload-artifact@v6
       with:
-        name: cemu-installer-windows-x64
-        path: ./src/resource/cemu-${{ inputs.next_version_major }}.${{ inputs.next_version_minor }}-windows-x64-installer.exe
+        name: cemu-installer-windows-${{ matrix.arch }}
+        path: ./src/resource/cemu-${{ inputs.next_version_major }}.${{ inputs.next_version_minor }}-windows-${{ matrix.arch }}-installer.exe
 
   build-macos:
     runs-on: macos-14

CMakeLists.txt

@@ -51,8 +51,16 @@ if (ENABLE_VCPKG)
 	# CONFIG option
 	set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
 	if (WIN32)
-		set(VCPKG_TARGET_TRIPLET "x64-windows-static" CACHE STRING "")
-	endif()
+		message(STATUS "CPU Arch is: $ENV{PROCESSOR_ARCHITECTURE}")  
+		if($ENV{PROCESSOR_ARCHITECTURE} MATCHES "x86_64|amd64|AMD64")
+			set(VCPKG_TARGET_TRIPLET "x64-windows-static" CACHE STRING "" FORCE)
+			set(VCPKG_HOST_TRIPLET "x64-windows-static" CACHE STRING "" FORCE)
+        else()
+			set(VCPKG_TARGET_TRIPLET "arm64-windows-static" CACHE STRING "" FORCE)
+			set(VCPKG_HOST_TRIPLET "arm64-windows-static" CACHE STRING "" FORCE)
+        endif()
+        message(STATUS "Using VCPKG triplet: ${VCPKG_TARGET_TRIPLET}")    
+    endif()
 endif()
 
 project(Cemu VERSION 2.0.0)
@@ -79,6 +87,7 @@ set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO ON)
 if (MSVC)
 	set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT CemuBin)
 	# floating point model: precise, fiber safe optimizations
+	add_compile_definitions(NOMINMAX)
 	add_compile_options(/EHsc /fp:precise)
 	if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 		# Speeds up static linking (especially helpful in incremental compilation)
@@ -173,6 +182,19 @@ if (NOT TARGET glslang::SPIRV AND TARGET SPIRV)
 	add_library(glslang::SPIRV ALIAS SPIRV)
 endif()
 
+if (UNIX AND NOT APPLE)
+	if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
+	    set(ARCH_TRIPLET "aarch64-linux-gnu")
+	elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+	    set(ARCH_TRIPLET "x86_64-linux-gnu")
+	else()
+	    message(WARNING "Unknown architecture: ${CMAKE_SYSTEM_PROCESSOR}")
+	endif()
+	if(ARCH_TRIPLET)
+	    set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/share/pkgconfig:/usr/lib/${ARCH_TRIPLET}/pkgconfig:/usr/local/share/pkgconfig")
+	endif()
+endif()
+
 if (UNIX AND NOT APPLE)
 	find_package(X11 REQUIRED)
 	if (ENABLE_WAYLAND)
@@ -253,6 +275,9 @@ if (ENABLE_CUBEB)
 endif()
 
 add_subdirectory("dependencies/ih264d" EXCLUDE_FROM_ALL)
+if(MSVC)
+    target_compile_options(ih264d PRIVATE /wd4005)
+endif()
 
 if (CMAKE_OSX_ARCHITECTURES)
 	set(CEMU_ARCHITECTURE ${CMAKE_OSX_ARCHITECTURES})
@@ -261,6 +286,9 @@ else()
 endif()
 if(CEMU_ARCHITECTURE MATCHES "(aarch64)|(AARCH64)|(arm64)|(ARM64)")
 	add_subdirectory("dependencies/xbyak_aarch64" EXCLUDE_FROM_ALL)
+	if(MSVC)
+		target_compile_options(xbyak_aarch64 PRIVATE "/wd4245" "/wd4458")
+    endif()
 endif()
 
 find_package(ZArchive QUIET)

CMakeSettings.json

@@ -1,4 +1,4 @@
-{
+{
   "configurations": [
     {
       "name": "RelWithDebInfo",
@@ -16,6 +16,14 @@
       "buildRoot": "${projectDir}\\out\\build\\${name}",
       "installRoot": "${projectDir}\\out\\install\\${name}"
     },
+    {
+      "name": "ARM64-Release",
+      "configurationType": "Release",
+      "generator": "Ninja",
+      "inheritEnvironments": [ "msvc_arm64_x64" ],
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}"
+    },
     {
       "name": "Debug",
       "configurationType": "Debug",
@@ -25,4 +33,4 @@
       "installRoot": "${projectDir}\\out\\install\\${name}"
     }
   ]
-}
+}