Merge pull request #32 from Im-Rises/develop

wip
Im-Rises · Apr 12, 2024 · e7354e5 · e7354e5
2 parents 5af0c81 + eae3d26
commit e7354e5
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/.github/workflows/cmake-vcpkg-emscripten-publish.yml b/.github/workflows/cmake-vcpkg-emscripten-publish.yml
@@ -50,7 +50,9 @@ jobs:
       #        run: emmake make -C build
 
       - name: Configure and build with CMake
-        run: ./build-wasm.sh buildWasm
+        run: |
+          chmod +x build-wasm.sh
+          ./build-wasm.sh buildWasm
 
       - name: Copy artefacts to web folder
         run: |

diff --git a/.github/workflows/cmake-vcpkg-emscripten.yml b/.github/workflows/cmake-vcpkg-emscripten.yml
@@ -52,4 +52,6 @@ jobs:
       #        run: emmake make -C build
 
       - name: Configure and build with CMake
-        run: ./build-wasm.sh buildWasm
+        run: |
+          chmod +x build-wasm.sh
+          ./build-wasm.sh buildWasm
diff --git a/Chip8topia/CMakeLists.txt b/Chip8topia/CMakeLists.txt
@@ -25,7 +25,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/u
 set_target_properties(${PROJECT_NAME} PROPERTIES WIN32_EXECUTABLE $<CONFIG:Release>)
 
 if (NOT EMSCRIPTEN)
-    find_package(sdl2 CONFIG REQUIRED)
+    find_package(SDL2 CONFIG REQUIRED)
     target_link_libraries(${PROJECT_NAME} PRIVATE SDL2::SDL2 SDL2::SDL2main)
 
     find_package(glad CONFIG REQUIRED)
@@ -42,6 +42,12 @@ if (NOT EMSCRIPTEN)
         target_link_libraries(${PROJECT_NAME} PUBLIC Pdh.lib) # For RAM usage
         target_link_libraries(${PROJECT_NAME} PUBLIC psapi.lib) # For CPU usage
     endif ()
+
+    if (UNIX AND NOT APPLE)
+        find_package(X11 REQUIRED)
+        target_include_directories(${PROJECT_NAME} PRIVATE ${X11_INCLUDE_DIR})
+        target_link_libraries(${PROJECT_NAME} PRIVATE ${X11_LIBRARIES})
+    endif ()
 else ()
     target_link_libraries(${PROJECT_NAME} PRIVATE SDL2::SDL2 SDL2::SDL2main)
 endif ()

diff --git a/Chip8topia/Chip8Emulator/Chip8Emulator/Chip8SoundEmulation.cpp b/Chip8topia/Chip8Emulator/Chip8Emulator/Chip8SoundEmulation.cpp
@@ -1,6 +1,7 @@
 #include "Chip8SoundEmulation.h"
 
-#include <sdl.h>
+#include <SDL.h>
+
 #include "../Chip8CoreBase/Chip8CoreBase.h"
 
 void Chip8SoundEmulation::update(Chip8CoreBase* chip8Core)

diff --git a/imgui.ini b/imgui.ini
@@ -81,8 +81,8 @@ Size=640,360
 Collapsed=0
 
 [Window][##TOAST0]
-Pos=1045,643
-Size=215,57
+Pos=1059,643
+Size=201,57
 Collapsed=0
 
 [Window][##TOAST3]