Fix CI Failing Build

sdslabs · Oct 11, 2023 · 6175ba3 · 6175ba3
1 parent 96f803a
commit 6175ba3
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 13 deletions.
diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
@@ -16,20 +16,29 @@ jobs:
  submodules: recursive
 
  - name: install_dependencies
+ shell: bash
  run: |
  if [ "$RUNNER_OS" == "Linux" ]; then
  sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse"
  sudo apt-get update -y -qq
- sudo apt-get install libsdl2-dev
+ sudo apt-get update && sudo apt-get install xorg-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libsdl2-dev
+ fi
+ if [ "$RUNNER_OS" == "macOS" ]; then
+ brew install SDL2
+ brew install SDL2_image
+ fi
+ if [ "$RUNNER_OS" == "Windows" ]; then
+ curl -L -O https://www.libsdl.org/release/SDL2-devel-2.28.4-VC.zip
+ 7z x SDL2-devel-2.28.4-VC.zip -oSDL2
  fi
 
  - name: build
+ shell: bash
  run: |
- if [ "$RUNNER_OS" == "Linux" ]; then
- sudo apt-get update && sudo apt-get install xorg-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev
+ if [ "$RUNNER_OS" == "Windows" ]; then
+ export SDL2_DIR=D:\\a\\gbemu\\gbemu\\SDL2\\SDL2-2.28.4\\cmake
  fi
  mkdir build
  cd build
  cmake ..
  cmake --build . -j 8
- shell: bash
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -15,7 +15,7 @@ set(SOURCES
  )
 
 target_sources(${PROJECT_NAME} PRIVATE ${SOURCES})
-
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 find_package(SDL2 REQUIRED)
 include_directories(${SDL2_INCLUDE_DIRS})
 
@@ -27,4 +27,4 @@ endif ()
 
 target_link_libraries(${PROJECT_NAME} ${SDL2_LIBRARIES})
 
-set(SDL2_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/include")
+set(SDL2_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/include")
diff --git a/src/graphics.h b/src/graphics.h
@@ -3,9 +3,14 @@
 #include "mmap.h"
 #include <stdio.h>
 #include <algorithm>
-#include <SDL.h>
 #include <vector>
 
+#ifdef __linux__
+#include <SDL2/SDL.h>
+#else
+#include <SDL.h>
+#endif
+
 struct Sprite
 {
  Word address;
@@ -59,7 +64,7 @@ class PPU
  // OBP1 register is the OBJ Palette 1 Data
  Byte objPalette1;
 
- // Internal window line counter 
+ // Internal window line counter
  Byte hiddenWindowLineCounter;
 
  // The GameBoy screen
@@ -117,4 +122,4 @@ class PPU
  void setMemoryMap(MemoryMap* m) { mMap = m; }
  void executePPU(int cycles);
  Byte getPPUMode() { return ppuMode; }
-};
+};
diff --git a/src/mmap.cpp b/src/mmap.cpp
@@ -299,7 +299,8 @@ void MemoryMap::readInput(Byte value)
  ioPorts[0] = current;
 }
 
-void MemoryMap::mapRom() {
+void MemoryMap::mapRom()
+{
  // Load the Boot ROM
  // Into the first 0x100 bytes
  fread(romBank0, 1, 256, bootRomFile);
@@ -315,7 +316,8 @@ void MemoryMap::mapRom() {
  mbcMode = romBank0[0x147];
 }
 
-void MemoryMap::unloadBootRom() {
+void MemoryMap::unloadBootRom()
+{
  fseek(romFile, 0x00, SEEK_SET);
  fread(romBank0, 1, 256, romFile);
 }
diff --git a/src/mmap.h b/src/mmap.h
@@ -10,8 +10,8 @@ class MemoryMap
 private:
  Byte mbcMode;
 
- FILE *bootRomFile;
- FILE *romFile;
+ FILE* bootRomFile;
+ FILE* romFile;
 
  // First ROM Bank
  // 16 KB 0x0000 - 0x3FFF