fix ci tests for macos

Author: malytomas

.github/workflows/tests.yml

@@ -241,9 +241,9 @@ jobs:
     - name: Versions
       run: |
         cmake --version
+        git --version
         clang --version
         clang++ --version
-        git --version
 
     - uses: actions/checkout@v4
       with:
@@ -268,29 +268,25 @@ jobs:
 
 
   MacOS:
-    name: macos-${{ matrix.build-config }}
-    runs-on: macos-latest
-    env:
-      LDFLAGS: "-L/opt/homebrew/opt/llvm/lib"
-      CPPFLAGS: "-I/opt/homebrew/opt/llvm/include"
-      CC: /opt/homebrew/opt/llvm/bin/clang
-      CXX: /opt/homebrew/opt/llvm/bin/clang++
+    name: macos-${{ matrix.os-version }}-${{ matrix.build-config }}
+    runs-on: macos-${{ matrix.os-version }}
     strategy:
       fail-fast: false
       matrix:
+        os-version: [14, 15]
         build-config: [debug, release]
 
     steps:
     - name: Install packages
       run: |
-        brew install nasm llvm
+        brew install nasm
 
     - name: Versions
       run: |
         cmake --version
         git --version
-        ${CC} --version
-        ${CXX} --version
+        clang --version
+        clang++ --version
 
     - uses: actions/checkout@v4
       with:
@@ -311,3 +307,11 @@ jobs:
       run: |
         cd build/result/${{ matrix.build-config }}
         ./cage-test-core
+
+    - name: List dependencies
+      run: |
+        cd build/result/${{ matrix.build-config }}
+        echo "cage-core:"
+        otool -L libcage-core.dylib
+        echo "cage-engine:"
+        otool -L libcage-engine.dylib

cmake/cage_build_configuration.cmake

@@ -85,16 +85,22 @@ macro(cage_build_configuration)
 		set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto")
 		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -flto")
 
-		# prevent requiring executable stack (Linux only)
-		if(NOT APPLE)
-			add_link_options(-Wl,-z,noexecstack)
-		endif()
-
 		# disable some warnings
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-attributes")
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes -Wno-abi")
 	endif()
 
+	if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+		# prevent requiring executable stack
+		add_link_options(-Wl,-z,noexecstack)
+	endif()
+
+	if(APPLE)
+		# disable more warnings
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
+	endif()
+
 	if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-assume") # __builtin_assume has side effects that are discarded
 	endif()

externals/avir/dummy.cpp

@@ -1,4 +1,4 @@
 void avir_dummy_unused_symbol_to_force_cpp_compilation()
 {
-    // do nothing
-}
+	// do nothing
+}

externals/dualmc/dummy.cpp

@@ -1,4 +1,4 @@
 void dualmc_dummy_unused_symbol_to_force_cpp_compilation()
 {
-    // do nothing
-}
+	// do nothing
+}

externals/fastnoise/dummy.cpp

@@ -1,4 +1,4 @@
 void fastnoise_dummy_unused_symbol_to_force_cpp_compilation()
 {
-    // do nothing
-}
+	// do nothing
+}

sources/libcore/filesystem/realFiles.cpp

@@ -6,21 +6,27 @@
 	#define ftell64 _ftelli64
 	#define fseek invalidFunctionFseek
 	#define ftell invalidFunctionFtell
-#else
+#endif
+
+#ifdef CAGE_SYSTEM_LINUX
+	#define _FILE_OFFSET_BITS 64
+	#include <dirent.h>
+	#include <sys/stat.h>
+	#include <unistd.h>
+	#define fseek64 fseeko64
+	#define ftell64 ftello64
+#endif
+
+#ifdef CAGE_SYSTEM_MAC
 	#define _FILE_OFFSET_BITS 64
 	#include <dirent.h>
 	#include <sys/stat.h>
 	#include <unistd.h>
-	#ifdef CAGE_SYSTEM_MAC
-		#define fseek64 fseeko
-		#define ftell64 ftello
-		#define pread64 pread
-		#define pwrite64 pwrite
-		#include <mach-o/dyld.h>
-	#else
-		#define fseek64 fseeko64
-		#define ftell64 ftello64
-	#endif
+	#include <mach-o/dyld.h>
+	#define fseek64 fseeko
+	#define ftell64 ftello
+	#define pread64 pread
+	#define pwrite64 pwrite
 #endif
 
 #include "files.h"

sources/libcore/string.cpp

@@ -185,13 +185,14 @@ namespace cage
 
 #ifdef CAGE_SYSTEM_MAC
 		// macOS doesn't support from_chars for floating point yet
+
 		void fromString(const char *s, uint32 n, float &value)
 		{
 			if (n == 0)
 				CAGE_THROW_ERROR(Exception, "empty string cannot be converted to float");
 
 			// Check for leading or trailing whitespace
-			if (n > 0 && (std::isspace(s[0]) || std::isspace(s[n-1])))
+			if (n > 0 && (std::isspace(s[0]) || std::isspace(s[n - 1])))
 			{
 				CAGE_LOG_THROW(Stringizer() + "input string: " + s);
 				CAGE_THROW_ERROR(Exception, "string with leading or trailing whitespace cannot be converted to float");
@@ -218,7 +219,7 @@ namespace cage
 				CAGE_THROW_ERROR(Exception, "empty string cannot be converted to double");
 
 			// Check for leading or trailing whitespace
-			if (n > 0 && (std::isspace(s[0]) || std::isspace(s[n-1])))
+			if (n > 0 && (std::isspace(s[0]) || std::isspace(s[n - 1])))
 			{
 				CAGE_LOG_THROW(Stringizer() + "input string: " + s);
 				CAGE_THROW_ERROR(Exception, "string with leading or trailing whitespace cannot be converted to double");
@@ -249,8 +250,10 @@ namespace cage
 				CAGE_THROW_ERROR(Exception, "failed conversion of float to string");
 			// Remove trailing zeros
 			char *p = s + result - 1;
-			while (p > s && *p == '0') p--;
-			if (*p == '.') p--;
+			while (p > s && *p == '0')
+				p--;
+			if (*p == '.')
+				p--;
 			*(++p) = '\0';
 			return numeric_cast<uint32>(p - s);
 		}
@@ -265,27 +268,32 @@ namespace cage
 				CAGE_THROW_ERROR(Exception, "failed conversion of double to string");
 			// Remove trailing zeros
 			char *p = s + result - 1;
-			while (p > s && *p == '0') p--;
-			if (*p == '.') p--;
+			while (p > s && *p == '0')
+				p--;
+			if (*p == '.')
+				p--;
 			*(++p) = '\0';
 			return numeric_cast<uint32>(p - s);
 		}
+
 #else // CAGE_SYSTEM_MAC
-#define GCHL_GENERATE(TYPE) \
-	uint32 toString(char *s, uint32 n, TYPE value) \
-	{ \
-		const auto [p, ec] = std::to_chars(s, s + n, value, std::chars_format::fixed); \
-		if (ec != std::errc()) \
-			CAGE_THROW_ERROR(Exception, "failed conversion of " CAGE_STRINGIZE(TYPE) " to string"); \
-		*p = 0; \
-		return numeric_cast<uint32>(p - s); \
-	} \
-	GCHL_FROMSTRING(TYPE)
+
+	#define GCHL_GENERATE(TYPE) \
+		uint32 toString(char *s, uint32 n, TYPE value) \
+		{ \
+			const auto [p, ec] = std::to_chars(s, s + n, value, std::chars_format::fixed); \
+			if (ec != std::errc()) \
+				CAGE_THROW_ERROR(Exception, "failed conversion of " CAGE_STRINGIZE(TYPE) " to string"); \
+			*p = 0; \
+			return numeric_cast<uint32>(p - s); \
+		} \
+		GCHL_FROMSTRING(TYPE)
 
 		GCHL_GENERATE(float);
 		GCHL_GENERATE(double);
+	#undef GCHL_GENERATE
+
 #endif // CAGE_SYSTEM_MAC
-#undef GCHL_GENERATE
 
 		uint32 toString(char *s, uint32 n, bool value)
 		{

sources/libcore/systemInformation.cpp

@@ -5,18 +5,25 @@
 	#include <powerbase.h> // CallNtPowerInformation
 	#pragma comment(lib, "PowrProf.lib") // CallNtPowerInformation
 	#pragma comment(lib, "Advapi32.lib") // RegGetValue
-#else
+#endif
+
+#ifdef CAGE_SYSTEM_LINUX
+	#include <algorithm>
+	#include <cstdlib> // getenv
+	#include <sstream>
+	#include <string>
+#endif
+
+#ifdef CAGE_SYSTEM_MAC
 	#include <algorithm>
 	#include <cstdlib> // getenv
 	#include <sstream>
 	#include <string>
-	#ifdef CAGE_SYSTEM_MAC
-		#include <mach/mach.h>
-		#include <mach/vm_statistics.h>
-		#include <mach/mach_host.h>
-		#include <sys/sysctl.h>
-		#include <unistd.h> // gethostname
-	#endif
+	#include <mach/mach.h>
+	#include <mach/vm_statistics.h>
+	#include <mach/mach_host.h>
+	#include <sys/sysctl.h>
+	#include <unistd.h> // gethostname
 #endif
 
 #include <cage-core/concurrent.h> // currentProcessId
@@ -100,17 +107,17 @@ namespace cage
 			return Stringizer() + readString("ProductName") + " " + readString("DisplayVersion") + " (" + readString("CurrentVersion") + ", " + readUint("CurrentMajorVersionNumber") + "." + readUint("CurrentMinorVersionNumber") + ", " + readString("CurrentBuildNumber") + ", " + readString("EditionID") + ", " + readString("InstallationType") + ")";
 #elif defined(CAGE_SYSTEM_MAC)
 			// Get macOS version using sysctlbyname
-			char versionStr[256] = {0};
+			char versionStr[256] = { 0 };
 			size_t size = sizeof(versionStr);
 			sysctlbyname("kern.osproductversion", versionStr, &size, nullptr, 0);
 
 			// Get build version
-			char buildStr[256] = {0};
+			char buildStr[256] = { 0 };
 			size = sizeof(buildStr);
 			sysctlbyname("kern.osversion", buildStr, &size, nullptr, 0);
 
 			// Get kernel version
-			char kernelStr[256] = {0};
+			char kernelStr[256] = { 0 };
 			size = sizeof(kernelStr);
 			sysctlbyname("kern.version", kernelStr, &size, nullptr, 0);