Rework external_deps for Saigo and CMake-based NaCL rebuild

CMakeLists.txt

@@ -190,7 +190,7 @@ else()
 endif()
 
 # Dependencies version, this must match the number in external_deps/build.sh
-set(DEPS_VERSION 11)
+set(DEPS_VERSION 12)
 
 option(USE_EXTERNAL_DEPS "Download or reuse dependencies from EXTERNAL_DEPS_DIR (mandatory for building and running NaCl .nexe binaries)." ON)
 
@@ -220,17 +220,7 @@ if (USE_EXTERNAL_DEPS AND NOT YOKAI_TARGET_SYSTEM_NACL)
         set(SUPPORTED_${DEPS_SYSTEM}_ARCH amd64 i686)
     elseif (YOKAI_TARGET_SYSTEM_MACOS)
         set(DEPS_SYSTEM macos)
-        set(SUPPORTED_${DEPS_SYSTEM}_ARCH amd64)
-
-        if (YOKAI_TARGET_ARCH_ARM64)
-            set(DEPS_ARCH amd64)
-
-            set_deps_dir()
-
-            if (NOT EXISTS ${DEPS_DIR})
-                set(DEFAULT_USE_EXTERNAL_DEPS_LIBS OFF)
-            endif()
-        endif()
+        set(SUPPORTED_${DEPS_SYSTEM}_ARCH amd64 arm64)
     elseif (YOKAI_TARGET_SYSTEM_LINUX)
         set(DEPS_SYSTEM linux)
         set(SUPPORTED_${DEPS_SYSTEM}_ARCH amd64 i686 arm64 armhf)
@@ -973,8 +963,8 @@ if (DEPS_DIR AND HAS_NACL AND (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER
     # The NaCl loader and IRT are required to load .nexe files
     add_custom_command(TARGET runtime_deps PRE_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            ${DEPS_DIR}/nacl_loader${CMAKE_EXECUTABLE_SUFFIX}
-            ${FULL_OUTPUT_DIR}/nacl_loader${CMAKE_EXECUTABLE_SUFFIX}
+            ${DEPS_DIR}/nacl_loader-${DAEMON_NACL_ARCH_NAME}${CMAKE_EXECUTABLE_SUFFIX}
+            ${FULL_OUTPUT_DIR}/nacl_loader-${DAEMON_NACL_ARCH_NAME}${CMAKE_EXECUTABLE_SUFFIX}
     )
 
     add_custom_command(TARGET runtime_deps PRE_BUILD
@@ -986,8 +976,8 @@ if (DEPS_DIR AND HAS_NACL AND (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER
     # Linux uses a bootstrap program to reserve address space
     if (YOKAI_TARGET_SYSTEM_LINUX_COMPATIBILITY)
         if (YOKAI_TARGET_ARCH_ARM64)
-            add_executable(nacl_helper_bootstrap-armhf tools/nacl_helper_bootstrap-armhf/nacl_helper_bootstrap-armhf.cpp)
-            add_dependencies(runtime_deps nacl_helper_bootstrap-armhf)
+            add_executable(nacl_helper_bootstrap-ldarmhf tools/nacl_helper_bootstrap-ldarmhf/nacl_helper_bootstrap-ldarmhf.cpp)
+            add_dependencies(runtime_deps nacl_helper_bootstrap-ldarmhf)
 
             add_custom_command(TARGET runtime_deps PRE_BUILD
                 COMMAND ${CMAKE_COMMAND} -E make_directory
@@ -1003,8 +993,8 @@ if (DEPS_DIR AND HAS_NACL AND (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER
 
         add_custom_command(TARGET runtime_deps PRE_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                ${DEPS_DIR}/nacl_helper_bootstrap
-                ${FULL_OUTPUT_DIR}/nacl_helper_bootstrap
+                ${DEPS_DIR}/nacl_helper_bootstrap-${DAEMON_NACL_ARCH_NAME}
+                ${FULL_OUTPUT_DIR}/nacl_helper_bootstrap-${DAEMON_NACL_ARCH_NAME}
         )
     endif()
 

azure-pipelines.yml

@@ -22,9 +22,19 @@ pr:
       - .gitmodules
 
 jobs:
-  - job: Mac
+  - job: macOS
     pool:
       vmImage: 'macOS-15'
+    strategy:
+      matrix:
+        AppleClang amd64:
+          MACOS_ARCH: x86_64
+          MACOS_VERSION: 10.14
+          TEST: true
+        AppleClang arm64:
+          MACOS_ARCH: arm64
+          MACOS_VERSION: 11.7
+          TEST: false
     steps:
     - bash: |
         set -e
@@ -56,12 +66,14 @@ jobs:
         cmake --version
         export CFLAGS='-Wno-c++14-extensions'
         export CXXFLAGS='-Wno-c++14-extensions'
-        cmake -Wdev -Wdeprecated -DUSE_PRECOMPILED_HEADER=0 -DUSE_WERROR=1 -DBE_VERBOSE=1 -DCMAKE_BUILD_TYPE=Release -DBUILD_DUMMY_APP=1 -DBUILD_DUMMY_GAMELOGIC=1 -DBUILD_TESTS=1 -H. -Bbuild
+        cmake -Wdev -Wdeprecated -DCMAKE_OSX_ARCHITECTURES=${MACOS_ARCH} -DCMAKE_OSX_DEPLOYMENT_TARGET=${MACOS_VERSION} -DPREFER_EXTERNAL_LIBS=OFF -DUSE_PRECOMPILED_HEADER=0 -DUSE_WERROR=1 -DBE_VERBOSE=1 -DCMAKE_BUILD_TYPE=Release -DBUILD_DUMMY_APP=1 -DBUILD_DUMMY_GAMELOGIC=1 -DBUILD_TESTS=1 -H. -Bbuild
         cmake --build build -- -j`sysctl -n hw.logicalcpu`
       displayName: 'Build'
     - bash: |
-        set -e
-        build/test-ttyclient -pakpath pkg -set fs_basepak daemon -set vm.cgame.type 3
+        if "${TEST}"; then
+          set -e
+          build/test-ttyclient -pakpath pkg -set fs_basepak daemon -set vm.cgame.type 3
+        fi
       displayName: 'Test'
 
   - job: Linux

cmake/DaemonNacl.cmake

@@ -26,7 +26,7 @@
 
 # Native client
 
-option(USE_NACL_SAIGO "Use Saigo toolchain to build NaCl executables" OFF)
+option(USE_NACL_SAIGO "Use the Saigo toolchain to build NaCl executables" ON)
 
 if (YOKAI_TARGET_SYSTEM_NACL)
   # Build nexe binary.

cmake/DaemonNaclHost.cmake

@@ -25,18 +25,18 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 function(daemon_detect_nacl_arch)
-	set(arch_name "${YOKAI_TARGET_ARCH_NAME}")
-	set(nacl_arch "${arch_name}")
+	set(target_arch "${YOKAI_TARGET_ARCH_NAME}")
+	set(nacl_arch "${target_arch}")
 
 	if (YOKAI_TARGET_SYSTEM_LINUX_COMPATIBILITY OR YOKAI_TARGET_SYSTEM_XDG_COMPATIBILITY)
-		set(armhf_usage "arm64;armel")
-		if ("${arch_name}" IN_LIST armhf_usage)
-		# Load 32-bit armhf nexe on 64-bit arm64 engine on Linux with multiarch.
-		# The nexe is system agnostic so there should be no difference with armel.
-		set(nacl_arch "armhf")
+		set(armhf_usage "arm64" "armel")
+		set(box64_usage "ppc64el" "riscv64")
 
-		set(box64_usage ppc64el riscv64)
-		if ("${arch_name}" IN_LIST box64_usage)
+		if ("${target_arch}" IN_LIST armhf_usage)
+			# Load 32-bit armhf nexe on 64-bit arm64 engine on Linux with multiarch.
+			# The nexe is system agnostic so there should be no difference with armel.
+			set(nacl_arch "armhf")
+		elseif ("${target_arch}" IN_LIST box64_usage)
 			option(DAEMON_NACL_BOX64_EMULATION "Use Box64 to emulate x86_64 NaCl loader on unsupported platforms" ON)
 			if (DAEMON_NACL_BOX64_EMULATION)
 				# Use Box64 to run x86_64 NaCl loader and amd64 nexe.
@@ -45,27 +45,32 @@ function(daemon_detect_nacl_arch)
 				add_definitions(-DDAEMON_NACL_BOX64_EMULATION)
 			endif()
 		endif()
-	endif()
-
-	elseif (DAEMON_TARGET_SYSTEM_MACOS)
-		if ("${arch_name}" STREQUAL "arm64")
+	elseif (YOKAI_TARGET_SYSTEM_MACOS)
+		if ("${target_arch}" STREQUAL "arm64")
 			# You can get emulated NaCl going like this:
 			# cp external_deps/macos-amd64-default_10/{nacl_loader,irt_core-amd64.nexe} build/
 			set(nacl_arch "amd64")
 		endif()
 	endif()
 
-	string(TOUPPER "${nacl_arch_name}" nacl_arch_name_upper)
-
-	# The DAEMON_NACL_ARCH_NAME variable contributes to the nexe file name.
-	set(DAEMON_NACL_ARCH_NAME "${nacl_arch}" PARENT_SCOPE)
-	set(DAEMON_NACL_ARCH_NAME_UPPER "${nacl_arch_upper}" PARENT_SCOPE)
+	string(TOUPPER "${nacl_arch}" nacl_arch_upper)
 
 	# NaCl runtime is only available on architectures that have a NaCl loader.
-	set(nacl_runtime_arch amd64 i686 armhf)
+	set(nacl_runtime_arch "amd64" "i686" "armhf")
 	if ("${nacl_arch}" IN_LIST nacl_runtime_arch)
+		message(STATUS "Detected NaCl architecture: ${nacl_arch}")
+
 		add_definitions(-DDAEMON_NACL_RUNTIME_ENABLED)
+	else()
+		set(nacl_arch "unknown")
+
+		message(STATUS "No NaCl architecture detected")
 	endif()
+
+	# The DAEMON_NACL_ARCH_NAME variable contributes to the nexe file name.
+	set(DAEMON_NACL_ARCH_NAME "${nacl_arch}" PARENT_SCOPE)
+
+	set(DAEMON_NACL_ARCH_NAME_UPPER "${nacl_arch_upper}" PARENT_SCOPE)
 endfunction()
 
 daemon_detect_nacl_arch()