Update required packages in Workflow

P0ulpy · Jul 23, 2024 · c0cf53f · c0cf53f
1 parent 8bb8a4d
commit c0cf53f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/cmake-build-debug.yml b/.github/workflows/cmake-build-debug.yml
@@ -31,6 +31,8 @@ jobs:
             c_compiler: gcc
           - os: macos-latest
             c_compiler: cl
+          - os: macos-latest
+            c_compiler: gcc
           - os: ubuntu-latest
             c_compiler: cl
 
@@ -41,15 +43,15 @@ jobs:
 
       - name: Install dependencies on Ubuntu for GLFW3
         if: runner.os == 'ubuntu-latest'
-        run: sudo apt install libxinerama-dev libxcursor-dev xorg-dev libglu1-mesa-dev pkg-config
+        run: sudo apt install libxinerama-dev libxcursor-dev pkg-config xcursor xinerama xorg-dev xorg libglu1-mesa-dev libglu1-mesa
 
       - name: Install dependencies on Ubuntu for Raylib
         if: runner.os == 'ubuntu-latest'
         run: sudo apt install libgl1-mesa-dev libx11-dev libxcursor-dev libxinerama-dev libxrandr-dev
 
       - name: Install dependencies on macOS for GLFW3
         if: runner.os == 'macos-latest'
-        run: brew install install libxinerama-dev libxcursor-dev xorg-dev libglu1-mesa-dev pkg-config
+        run: brew install install libxinerama-dev libxcursor-dev pkg-config xcursor xinerama xorg-dev xorg libglu1-mesa-dev libglu1-mesa
 
       - name: Install dependencies on macOS for Raylib
         if: runner.os == 'macos-latest'

diff --git a/.github/workflows/cmake-build-release.yml b/.github/workflows/cmake-build-release.yml
@@ -31,6 +31,8 @@ jobs:
             c_compiler: gcc
           - os: macos-latest
             c_compiler: cl
+          - os: macos-latest
+            c_compiler: gcc
           - os: ubuntu-latest
             c_compiler: cl
 
@@ -41,15 +43,15 @@ jobs:
 
       - name: Install dependencies on Ubuntu for GLFW3
         if: runner.os == 'ubuntu-latest'
-        run: sudo apt install libxinerama-dev libxcursor-dev xorg-dev libglu1-mesa-dev pkg-config
+        run: sudo apt install libxinerama-dev libxcursor-dev pkg-config xcursor xinerama xorg-dev xorg libglu1-mesa-dev libglu1-mesa
 
       - name: Install dependencies on Ubuntu for Raylib
         if: runner.os == 'ubuntu-latest'
         run: sudo apt install libgl1-mesa-dev libx11-dev libxcursor-dev libxinerama-dev libxrandr-dev
 
       - name: Install dependencies on macOS for GLFW3
         if: runner.os == 'macos-latest'
-        run: brew install install libxinerama-dev libxcursor-dev xorg-dev libglu1-mesa-dev pkg-config
+        run: brew install install libxinerama-dev libxcursor-dev pkg-config xcursor xinerama xorg-dev xorg libglu1-mesa-dev libglu1-mesa
 
       - name: Install dependencies on macOS for Raylib
         if: runner.os == 'macos-latest'

diff --git a/src/Editor/WorldEditor.hpp b/src/Editor/WorldEditor.hpp
@@ -294,7 +294,7 @@ class WorldEditor
 
             if(toSector != NULL_SECTOR)
             {
-                ImGui::Text("[%zu] => %zu", i, toSector);
+                ImGui::Text("[%zu] => %u", i, toSector);
             }
             else
             {
-Original file line number
+Diff line change
@@ Expand Up / @@ -294,7 +294,7 @@ class WorldEditor @@
                 if(toSector != NULL_SECTOR)
                 {
-                    ImGui::Text("[%zu] => %zu", i, toSector);
+                    ImGui::Text("[%zu] => %u", i, toSector);
                 }
                 else
                 {
@@ Expand Down @@