attempt to fix ubuntu build on actions

ezillinger · May 5, 2024 · aca46b0 · aca46b0
1 parent 7d288f7
commit aca46b0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
@@ -35,17 +35,22 @@ jobs:
             cpp_compiler: g++-13
           - os: ubuntu-latest
             c_compiler: clang-18
-            cpp_compiler: clang++-18
+            cpp_compiler: clang++
         exclude:
           - os: windows-latest
             c_compiler: gcc-13
           - os: windows-latest
             c_compiler: clang-18
+            # disable windows until we figure out SDL2 install
+          - os: windows-latest
+            c_compiler: cl
           - os: ubuntu-latest
             c_compiler: cl
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: 'recursive'
 
     - name: Set reusable strings
       # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.

diff --git a/src/APU.cpp b/src/APU.cpp
@@ -1,6 +1,4 @@
-
 #include "APU.h"
-#include "imgui.h"
 
 namespace ez {
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -10,7 +10,6 @@ target_compile_definitions(ezgb PRIVATE IMGUI_USER_CONFIG="../../ImGuiConfig.h")
 
 target_include_directories(ezgb PRIVATE 
                           ./libs/imgui 
-#                          ./libs/imgui/misc/freetype
 )   
 
 if(MSVC)

diff --git a/src/Window.cpp b/src/Window.cpp
@@ -2,7 +2,7 @@
 
 #include "libs/imgui/backends/imgui_impl_opengl3.h"
 #include "libs/imgui/backends/imgui_impl_sdl2.h"
-#include "libs/imgui/imgui.h"
+#include "ThirdParty_ImGui.h"
 
 namespace ez {