yokai: use TARGET_ARCH

Author: illwieckz

CMakeLists.txt

@@ -205,7 +205,7 @@ if (USE_EXTERNAL_DEPS AND NOT YOKAI_TARGET_SYSTEM_NACL)
 
     set(DEPS_EXT ".tar.xz")
 
-    set(DEPS_ARCH "${YOKAI_ARCH_NAME}")
+    set(DEPS_ARCH "${YOKAI_TARGET_ARCH_NAME}")
 
     if (YOKAI_CXX_COMPILER_MSVC_COMPATIBILITY)
         set(DEPS_COMPILER msvc)
@@ -222,7 +222,7 @@ if (USE_EXTERNAL_DEPS AND NOT YOKAI_TARGET_SYSTEM_NACL)
         set(DEPS_SYSTEM macos)
         set(SUPPORTED_${DEPS_SYSTEM}_ARCH amd64)
 
-        if (YOKAI_ARCH_ARM64)
+        if (YOKAI_TARGET_ARCH_ARM64)
             set(DEPS_ARCH amd64)
 
             set_deps_dir()
@@ -682,10 +682,10 @@ if (BUILD_CLIENT OR YOKAI_TARGET_SYSTEM_WINDOWS)
     set(sdlvar_amd64 SDL_CPU_X64)
     set(sdlvar_armhf SDL_CPU_ARM32)
     set(sdlvar_arm64 SDL_CPU_ARM64)
-    if (sdlvar_${YOKAI_ARCH_NAME})
-        set(${sdlvar_${YOKAI_ARCH_NAME}} 1)
+    if (sdlvar_${YOKAI_TARGET_ARCH_NAME})
+        set(${sdlvar_${YOKAI_TARGET_ARCH_NAME}} 1)
     else()
-        message("Developer TODO: translate architecture ${YOKAI_ARCH_NAME} for SDL")
+        message("Developer TODO: translate architecture ${YOKAI_TARGET_ARCH_NAME} for SDL")
     endif()
 
     find_package(SDL3 REQUIRED CONFIG)
@@ -985,7 +985,7 @@ 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_ARCH_ARM64)
+        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)
 
@@ -1009,7 +1009,7 @@ if (DEPS_DIR AND HAS_NACL AND (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER
     endif()
 
     # Win32 requires nacl_loader_amd64.exe in order to run on Win64
-    if (YOKAI_TARGET_SYSTEM_WINDOWS AND YOKAI_ARCH_I686)
+    if (YOKAI_TARGET_SYSTEM_WINDOWS AND YOKAI_TARGET_ARCH_I686)
         add_custom_command(TARGET runtime_deps PRE_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy_if_different
                 ${DEPS_DIR}/nacl_loader-amd64${CMAKE_EXECUTABLE_SUFFIX}

cmake/DaemonFlags.cmake

@@ -531,12 +531,12 @@ else()
 
 		if ("${FLAG_LINKER_PIE}" AND MINGW)
 			# https://github.com/msys2/MINGW-packages/issues/4100
-			if (YOKAI_ARCH_I686)
+			if (YOKAI_TARGET_ARCH_I686)
 				set_linker_flag("-Wl,-e,_mainCRTStartup")
-			elseif(YOKAI_ARCH_AMD64)
+			elseif(YOKAI_TARGET_ARCH_AMD64)
 				set_linker_flag("-Wl,-e,mainCRTStartup")
 			else()
-				message(FATAL_ERROR "Unsupported architecture ${YOKAI_ARCH_NAME}")
+				message(FATAL_ERROR "Unsupported architecture ${YOKAI_TARGET_ARCH_NAME}")
 			endif()
 		endif()
 	endif()
@@ -606,7 +606,7 @@ option(USE_CPU_RECOMMENDED_FEATURES "Use some common hardware features like SSE2
 
 # Target options.
 if (YOKAI_CXX_COMPILER_MSVC_COMPATIBILITY)
-    if (YOKAI_ARCH_I686)
+    if (YOKAI_TARGET_ARCH_I686)
         if (USE_CPU_RECOMMENDED_FEATURES)
             set_c_cxx_flag("/arch:SSE2") # This is the default
         else()
@@ -626,7 +626,7 @@ elseif (NOT YOKAI_TARGET_SYSTEM_NACL)
 	# Running a server with a native executable game is also a valid usage
 	# not requiring the NX bit.
 
-	if (YOKAI_ARCH_AMD64)
+	if (YOKAI_TARGET_ARCH_AMD64)
 		# K8 or EM64T minimum: AMD Athlon 64 ClawHammer, Intel Xeon Nocona, Intel Pentium 4 model F (Prescott revision EO), VIA Nano.
 		if (YOKAI_CXX_COMPILER_ICC)
 			set(GCC_GENERIC_ARCH "pentium4")
@@ -636,15 +636,15 @@ elseif (NOT YOKAI_TARGET_SYSTEM_NACL)
 			set(GCC_GENERIC_ARCH "x86-64")
 		endif()
 		set(GCC_GENERIC_TUNE "generic")
-	elseif (YOKAI_ARCH_I686)
+	elseif (YOKAI_TARGET_ARCH_I686)
 		# P6 or K6 minimum: Intel Pentium Pro, AMD K6, Via Cyrix III, Via C3.
 		set(GCC_GENERIC_ARCH "i686")
 		set(GCC_GENERIC_TUNE "generic")
-	elseif (YOKAI_ARCH_ARM64)
+	elseif (YOKAI_TARGET_ARCH_ARM64)
 		# Armv8-A minimum: Cortex-A50.
 		set(GCC_GENERIC_ARCH "armv8-a")
 		set(GCC_GENERIC_TUNE "generic")
-	elseif (YOKAI_ARCH_ARMHF)
+	elseif (YOKAI_TARGET_ARCH_ARMHF)
 		# Armv7-A minimum with VFPv3 and optional NEONv1: Cortex-A5.
 		# Hard float ABI (mainstream 32-bit ARM Linux distributions).
 		# An FPU should be explicitly set on recent compilers or this
@@ -653,7 +653,7 @@ elseif (NOT YOKAI_TARGET_SYSTEM_NACL)
 		#   lacks an FPU
 		set(GCC_GENERIC_ARCH "armv7-a+fp")
 		set(GCC_GENERIC_TUNE "generic-armv7-a")
-	elseif (YOKAI_ARCH_ARMEL)
+	elseif (YOKAI_TARGET_ARCH_ARMEL)
 		# Armv6 minimum with optional VFP: ARM11.
 		# Soft float ABI (previous mainstream 32-bit ARM Linux
 		# distributions, mainstream 32-bit ARM Android distributions).
@@ -673,7 +673,7 @@ elseif (NOT YOKAI_TARGET_SYSTEM_NACL)
 		unset(GCC_GENERIC_TUNE)
 		set(GCC_GENERIC_CPU "power5")
 	else()
-		message(WARNING "Unknown architecture ${YOKAI_ARCH_NAME}")
+		message(WARNING "Unknown architecture ${YOKAI_TARGET_ARCH_NAME}")
 	endif()
 
 	if ("${YOKAI_CXX_COMPILER_NAME}" STREQUAL "Zig")
@@ -697,18 +697,18 @@ elseif (NOT YOKAI_TARGET_SYSTEM_NACL)
 	endif()
 
 	if (USE_CPU_RECOMMENDED_FEATURES)
-		if (YOKAI_ARCH_AMD64)
+		if (YOKAI_TARGET_ARCH_AMD64)
 			# CMPXCHG16B minimum (x86-64-v2): AMD64 revision F.
 			try_c_cxx_flag_werror(MCX16 "-mcx16")
-		elseif (YOKAI_ARCH_I686)
+		elseif (YOKAI_TARGET_ARCH_I686)
 			# SSE2 minimum: Intel Pentium 4 (Prescott),
 			# Intel Pentium M (Banias), AMD K8, Via C7.
 			try_c_cxx_flag_werror(MSSE2 "-msse2")
 			try_c_cxx_flag_werror(MFPMATH_SSE "-mfpmath=sse")
-		elseif (YOKAI_ARCH_ARMHF)
+		elseif (YOKAI_TARGET_ARCH_ARMHF)
 			# NEONv1 minimum.
 			try_c_cxx_flag_werror(MFPU_NEON "-mfpu=neon")
-		elseif (YOKAI_ARCH_ARMEL)
+		elseif (YOKAI_TARGET_ARCH_ARMEL)
 			# VFP minimum, hard float with soft float ABI.
 			try_c_cxx_flag_werror(MFPU_VFP "-mfpu=vfp")
 			try_c_cxx_flag_werror(MFLOAT_ABI_SOFTFP "-mfloat-abi=softfp")

cmake/DaemonGame.cmake

@@ -71,7 +71,7 @@ include(CMakeParseArguments)
 # The NaCl SDK only runs on amd64 or i686.
 if (NOT FORK EQUAL 2)
 	if (CMAKE_SYSTEM_NAME STREQUAL CMAKE_HOST_SYSTEM_NAME
-	AND (YOKAI_ARCH_AMD64 OR YOKAI_ARCH_I686))
+	AND (YOKAI_TARGET_ARCH_AMD64 OR YOKAI_TARGET_ARCH_I686))
 		# can be loaded by daemon with vm.[sc]game.type 0 or 1
 		option(BUILD_GAME_NACL "Build the NaCl \"pexe\" and \"nexe\" gamelogic modules for enabled architecture targets, required to host mods." OFF)
 
@@ -82,7 +82,7 @@ if (NOT FORK EQUAL 2)
 		if (BUILD_GAME_NACL_TARGETS STREQUAL "all")
 			set(NACL_TARGETS "${NACL_ALL_TARGETS}")
 		elseif (BUILD_GAME_NACL_TARGETS STREQUAL "native")
-			set(NACL_TARGETS "${YOKAI_ARCH_NAME}")
+			set(NACL_TARGETS "${YOKAI_TARGET_ARCH_NAME}")
 		elseif (BUILD_GAME_NACL_TARGETS STREQUAL "none")
 			set(NACL_TARGETS "")
 		else()

cmake/Yokai/Architecture.cmake

@@ -28,16 +28,16 @@
 # Architecture detection.
 ################################################################################
 
-# When adding a new architecture, look at all the places YOKAI_ARCH is used.
+# When adding a new architecture, look at all the places YOKAI_TARGET_ARCH is used.
 
 option(USE_ARCH_INTRINSICS "Enable custom code using intrinsics functions or asm declarations" ON)
 mark_as_advanced(USE_ARCH_INTRINSICS)
 
 function(yokai_detect_arch)
-	yokai_run_detection("" "ARCH" "Architecture.c" "")
+	yokai_run_detection("TARGET_" "ARCH" "Architecture.c" "")
 
-	set(YOKAI_ARCH_NAME "${arch_name}" PARENT_SCOPE)
-	set(YOKAI_ARCH_NAME_UPPER "${arch_name_upper}" PARENT_SCOPE)
+	set(YOKAI_TARGET_ARCH_NAME "${arch_name}" PARENT_SCOPE)
+	set(YOKAI_TARGET_ARCH_NAME_UPPER "${arch_name_upper}" PARENT_SCOPE)
 
 	message(STATUS "Detected target architecture: ${arch_name}")
 
@@ -105,35 +105,35 @@ function(yokai_set_intrinsics)
 		# Makes possible to do that in C++ code:
 		# > if defined(YOKAI_USE_ARCH_INTRINSICS_AMD64)
 		# > if defined(YOKAI_USE_ARCH_INTRINSICS_I686)
-		yokai_set_arch_intrinsics("${YOKAI_ARCH_NAME}")
+		yokai_set_arch_intrinsics("${YOKAI_TARGET_ARCH_NAME}")
 
 		set(amd64_PARENT "i686")
 		set(arm64_PARENT "armhf")
 		set(ppc64el_PARENT "ppc64")
 
-		if ("${YOKAI_ARCH_NAME}_PARENT")
-			yokai_set_arch_intrinsics("${${YOKAI_ARCH_NAME}_PARENT}")
+		if ("${YOKAI_TARGET_ARCH_NAME}_PARENT")
+			yokai_set_arch_intrinsics("${${YOKAI_TARGET_ARCH_NAME}_PARENT}")
 		endif()
 	else()
-		message(STATUS "Disabling ${YOKAI_ARCH_NAME} architecture intrinsics")
+		message(STATUS "Disabling ${YOKAI_TARGET_ARCH_NAME} architecture intrinsics")
 	endif()
 endfunction()
 
 yokai_detect_arch()
 yokai_set_intrinsics()
 
 # Makes possible to do that in CMake code:
-# > if (YOKAI_ARCH_ARM64)
+# > if (YOKAI_TARGET_ARCH_ARM64)
 # > if (YOKAI_NACL_ARCH_ARMHF)
-set("YOKAI_ARCH_${YOKAI_ARCH_NAME_UPPER}" ON)
+set("YOKAI_TARGET_ARCH_${YOKAI_TARGET_ARCH_NAME_UPPER}" ON)
 
 if (YOKAI_NACL_HOST)
 	set("YOKAI_NACL_ARCH_${YOKAI_NACL_ARCH_NAME_UPPER}" ON)
 endif()
 
 if (YOKAI_SOURCE_GENERATOR)
 	# Add printable strings to the executable.
-	yokai_add_buildinfo("char*" "YOKAI_ARCH_STRING" "\"${YOKAI_ARCH_NAME}\"")
+	yokai_add_buildinfo("char*" "YOKAI_ARCH_STRING" "\"${YOKAI_TARGET_ARCH_NAME}\"")
 
 	if (YOKAI_NACL_HOST)
 		yokai_add_buildinfo("char*" "YOKAI_NACL_ARCH_STRING" "\"${YOKAI_NACL_ARCH_NAME}\"")

cmake/Yokai/Detection/detect

@@ -54,6 +54,7 @@ do
 		| grep '<REPORT<' \
 		| sed -e 's/.*<REPORT<//;s/>REPORT>.*//' \
 		| sed -e 's/YOKAI_SYSTEM/YOKAI_TARGET_SYSTEM/' \
+		| sed -e 's/YOKAI_ARCH/YOKAI_TARGET_ARCH/' \
 		| sed -E 's/^([^=]+)=/\U\1=/' \
 	|| "${@}" "${file_path}" -o "${temp_file}"