Update older macOS GitHub Actions runner to 13

- Fix compilation with newer versions of ImGui
nCine · Dec 12, 2024 · 2394139 · 2394139
1 parent e08cb92
commit 2394139
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         BuildType: [Debug, Release, BinDist]
-        os: [macOS-12, macOS-14]
+        os: [macOS-13, macOS-14]
 
     runs-on: ${{ matrix.os }}
 
@@ -36,7 +36,7 @@ jobs:
         if [[ "${{ matrix.os }}" == "macOS-14" ]]; then
           export OS=macos14
         else
-          export OS=macos12
+          export OS=macos13
         fi
         export CC=appleclang
         export BRANCH_NAME=$(git describe --tags --exact-match 2> /dev/null || git symbolic-ref -q --short HEAD || git rev-parse --short HEAD)
@@ -112,7 +112,7 @@ jobs:
         if [[ "${{ matrix.os }}" == "macOS-14" ]]; then
           export OS=macos14
         else
-          export OS=macos12
+          export OS=macos13
         fi
         export CC=appleclang
         export PROJECT_EXT=dmg

diff --git a/src/particle_editor_gui.cpp b/src/particle_editor_gui.cpp
@@ -512,7 +512,7 @@ void MyEventHandler::createGuiTextures()
 		{
 			nc::Texture &tex = *textures_[texIndex_];
 			const ImVec2 size(tex.width(), tex.height());
-			ImGui::Image(tex.guiTexId(), size);
+			ImGui::Image(static_cast<ImTextureID>(reinterpret_cast<intptr_t>(tex.guiTexId())), size);
 		}
 	}
 	ImGui::PopID();
@@ -720,7 +720,7 @@ void MyEventHandler::createGuiSprite()
 		if (spriteState_.flippedY)
 			nctl::swap(uv0.y, uv1.y);
 
-		ImGui::Image(tex.guiTexId(), size, uv0, uv1);
+		ImGui::Image(static_cast<ImTextureID>(reinterpret_cast<intptr_t>(tex.guiTexId())), size, uv0, uv1);
 
 		int minX = spriteState_.texRect.x;
 		int maxX = minX + spriteState_.texRect.w;