Support two macOS GitHub Actions runner images

- Fix GitHub Actions compilation on MinGW
- Rename a filesystem function to fix compilation on Linux
- Update Linux and macOS GitHub Actions runner images

Author: encelo

.github/workflows/android.yml

@@ -18,7 +18,7 @@ jobs:
         ARCH: [armeabi-v7a, arm64-v8a, x86_64]
         BuildType: [Debug, Release]
 
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-22.04'
 
     steps:
     - name: 'Checkout Code'

.github/workflows/codeql-analysis.yml

@@ -9,7 +9,7 @@ on: [push, workflow_dispatch]
 jobs:
   analyze:
     name: 'Analyze'
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-22.04'
 
     strategy:
       fail-fast: false

.github/workflows/emscripten.yml

@@ -18,7 +18,7 @@ jobs:
       matrix:
         BuildType: [Debug, Release, BinDist]
 
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-22.04'
 
     steps:
     - name: 'Checkout Code'

.github/workflows/linux.yml

@@ -41,7 +41,7 @@ jobs:
           CC: clang
           CXX: clang++
 
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-22.04'
 
     steps:
     - name: 'Checkout Code'

.github/workflows/macos.yml

@@ -17,8 +17,9 @@ jobs:
       fail-fast: false
       matrix:
         BuildType: [Debug, Release, BinDist]
+        os: [macOS-12, macOS-14]
 
-    runs-on: 'macOS-11'
+    runs-on: ${{ matrix.os }}
 
     steps:
     - name: 'Checkout Code'
@@ -31,7 +32,11 @@ jobs:
 
     - name: 'Download nCine-libraries and project data'
       run: |
-        export OS=darwin
+        if [[ "${{ matrix.os }}" == "macOS-14" ]]; then
+          export OS=macos14
+        else
+          export OS=macos12
+        fi
         export CC=appleclang
 
         export LIBRARIES_BRANCH=`echo $LIBRARIES_BRANCH | sed 's/OS/'"$OS"'/'`
@@ -107,7 +112,11 @@ jobs:
         export DEPLOY_MESSAGE=`sed 's/PROJECT_NAME/'"$PROJECT_NAME"'/' <<< "$DEPLOY_MESSAGE"`
         export DEPLOY_MESSAGE=`sed 's/BRANCH_NAME/'"$BRANCH_NAME"'/' <<< "$DEPLOY_MESSAGE"`
 
-        export OS=darwin
+        if [[ "${{ matrix.os }}" == "macOS-14" ]]; then
+          export OS=macos14
+        else
+          export OS=macos12
+        fi
         export CC=appleclang
         export PROJECT_EXT=dmg
 

.github/workflows/mingw.yml

@@ -58,7 +58,7 @@ jobs:
       run: |
         $env:MSYSTEM = "MINGW64"
 
-        C:\msys64\usr\bin\bash -lc 'pacman --needed --noconfirm -S mingw-w64-x86_64-glew mingw-w64-x86_64-glfw mingw-w64-x86_64-SDL2 mingw-w64-x86_64-openal mingw-w64-x86_64-libvorbis mingw-w64-x86_64-libwebp mingw-w64-x86_64-lua cmake'
+        C:\msys64\usr\bin\bash -lc 'pacman --needed --noconfirm -S mingw-w64-x86_64-glew mingw-w64-x86_64-glfw mingw-w64-x86_64-SDL2 mingw-w64-x86_64-openal mingw-w64-x86_64-libvorbis mingw-w64-x86_64-libwebp mingw-w64-x86_64-lua mingw-w64-x86_64-cmake'
 
         if ("${{ matrix.CC }}" -eq "gcc") { C:\msys64\usr\bin\bash -lc 'pacman --needed --noconfirm -S mingw-w64-x86_64-gcc' }
         else { C:\msys64\usr\bin\bash -lc 'pacman --needed --noconfirm -S mingw-w64-x86_64-clang' }
@@ -106,12 +106,12 @@ jobs:
         cd ../nCine
         if ("${{ matrix.BuildType }}" -eq "BinDist")
         {
-          C:\msys64\usr\bin\bash.exe -lc 'cmake -G \"MSYS Makefiles\" -B ../nCine-build-Release -D CMAKE_BUILD_TYPE=Release -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=docking -D NCINE_PREFERRED_BACKEND=SDL2 -D NCINE_WITH_THREADS=OFF -D NCINE_WITH_WEBP=OFF -D NCINE_WITH_AUDIO=OFF -D NCINE_WITH_SCRIPTING_API=OFF -D NCINE_BUILD_TESTS=OFF'
+          C:\msys64\usr\bin\bash.exe -lc "cmake -G 'MSYS Makefiles' -B ../nCine-build-Release -D CMAKE_BUILD_TYPE=Release -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=docking -D NCINE_PREFERRED_BACKEND=SDL2 -D NCINE_WITH_THREADS=OFF -D NCINE_WITH_WEBP=OFF -D NCINE_WITH_AUDIO=OFF -D NCINE_WITH_SCRIPTING_API=OFF -D NCINE_BUILD_TESTS=OFF"
           C:\msys64\usr\bin\bash.exe -lc 'make -j2 -C ../nCine-build-Release'
         }
         else
         {
-          C:\msys64\usr\bin\bash.exe -lc 'cmake -G \"MSYS Makefiles\" -B ../nCine-build-${{ matrix.BuildType }} -D CMAKE_BUILD_TYPE=${{ matrix.BuildType }} -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=docking -D NCINE_PREFERRED_BACKEND=SDL2 -D NCINE_WITH_THREADS=OFF -D NCINE_WITH_WEBP=OFF -D NCINE_WITH_AUDIO=OFF -D NCINE_WITH_SCRIPTING_API=OFF -D NCINE_BUILD_TESTS=OFF'
+          C:\msys64\usr\bin\bash.exe -lc "cmake -G 'MSYS Makefiles' -B ../nCine-build-${{ matrix.BuildType }} -D CMAKE_BUILD_TYPE=${{ matrix.BuildType }} -D NCINE_DYNAMIC_LIBRARY=OFF -D IMGUI_VERSION_TAG=docking -D NCINE_PREFERRED_BACKEND=SDL2 -D NCINE_WITH_THREADS=OFF -D NCINE_WITH_WEBP=OFF -D NCINE_WITH_AUDIO=OFF -D NCINE_WITH_SCRIPTING_API=OFF -D NCINE_BUILD_TESTS=OFF"
           C:\msys64\usr\bin\bash.exe -lc 'make -j2 -C ../nCine-build-${{ matrix.BuildType }}'
         }
 
@@ -126,9 +126,9 @@ jobs:
         $env:MSYSTEM = "MINGW64"
 
         if ("${{ matrix.BuildType }}" -eq "BinDist")
-          { C:\msys64\usr\bin\bash.exe -lc 'cmake -G \"MSYS Makefiles\" -B ../$PROJECT_NAME-build-${{ matrix.BuildType }} -D NCPROJECT_OPTIONS_PRESETS=${{ matrix.BuildType }} -D nCine_DIR=$(pwd)/../nCine-build-Release' }
+          { C:\msys64\usr\bin\bash.exe -lc "cmake -G 'MSYS Makefiles' -B ../$env:PROJECT_NAME-build-${{ matrix.BuildType }} -D NCPROJECT_OPTIONS_PRESETS=${{ matrix.BuildType }} -D nCine_DIR=$(cygpath -m $PWD/../nCine-build-Release)" }
         else
-          { C:\msys64\usr\bin\bash.exe -lc 'cmake -G \"MSYS Makefiles\" -B ../$PROJECT_NAME-build-${{ matrix.BuildType }} -D nCine_DIR=$(pwd)/../nCine-build-${{ matrix.BuildType }}' }
+          { C:\msys64\usr\bin\bash.exe -lc "cmake -G 'MSYS Makefiles' -B ../$env:PROJECT_NAME-build-${{ matrix.BuildType }} -D CMAKE_BUILD_TYPE=${{ matrix.BuildType }} -D nCine_DIR=$(cygpath -m $PWD/../nCine-build-${{ matrix.BuildType }})" }
 
     - name: 'Make'
       env:

src/main.cpp

@@ -89,7 +89,7 @@ void MyEventHandler::onPreInit(nc::AppConfiguration &config)
 	if (nc::fs::isReadableFile(ui::auxString.data()) == false)
 		ui::auxString = "asset::config.lua";
 #elif defined(__linux__) && defined(NCPROJECT_DATA_DIR_DIST)
-	ui::auxString = nc::fs::joinPath(nc::fs::homeDir(), linuxConfigDir);
+	ui::auxString = nc::fs::joinPath(nc::fs::homePath(), linuxConfigDir);
 	if (nc::fs::exists(ui::auxString.data()) == false)
 	{
 		const bool dirCreated = nc::fs::createDir(ui::auxString.data());
@@ -154,7 +154,7 @@ void MyEventHandler::onInit()
 {
 #if defined(__linux__) && defined(NCPROJECT_DATA_DIR_DIST)
 	static char iniFilename[512];
-	strncpy(iniFilename, nc::fs::joinPath(nc::fs::joinPath(nc::fs::homeDir(), linuxConfigDir), "imgui.ini").data(), 512);
+	strncpy(iniFilename, nc::fs::joinPath(nc::fs::joinPath(nc::fs::homePath(), linuxConfigDir), "imgui.ini").data(), 512);
 	ImGui::GetIO().IniFilename = iniFilename;
 #endif