Merge pull request #9 from Im-Rises/newversion

Newversion
Im-Rises · Feb 27, 2024 · 016a57c · 016a57c
2 parents 38651f8 + 21184f4
commit 016a57c
Show file tree

Hide file tree

Showing 58 changed files with 1,696 additions and 927 deletions.
diff --git a/.github/workflows/cmake-vcpkg-emscripten.yml b/.github/workflows/cmake-vcpkg-emscripten.yml
@@ -5,6 +5,8 @@ name: CMake Vcpkg Emscripten
 on:
   push:
     branches: [ "main" ]
+  pull_request:
+#    branches: [ "main" ]
 
 permissions:
   contents: read

diff --git a/.github/workflows/cmake-vcpkg-publish-binaries.yml b/.github/workflows/cmake-vcpkg-publish-binaries.yml
@@ -94,7 +94,8 @@ jobs:
         run: |
           mkdir ${{ github.workspace }}/${{ matrix.executable_name }}-${{ matrix.os }}-v${{ github.run_number }}
           cp -r ${{ github.workspace }}/imgui.ini ${{ github.workspace }}/${{ matrix.executable_name }}-${{ matrix.os }}-v${{ github.run_number }}
-            cp -r ${{ github.workspace }}/shaders ${{ github.workspace }}/${{ matrix.executable_name }}-${{ matrix.os }}-v${{ github.run_number }}
+          cp -r ${{ github.workspace }}/shaders ${{ github.workspace }}/${{ matrix.executable_name }}-${{ matrix.os }}-v${{ github.run_number }}
+          cp -r ${{ github.workspace }}/Chip8Games ${{ github.workspace }}/${{ matrix.executable_name }}-${{ matrix.os }}-v${{ github.run_number }}
 
       - name: Copy artifacts ubuntu
         if: matrix.os == 'ubuntu-latest'

diff --git a/Chip8topia/CMakeLists.txt b/Chip8topia/CMakeLists.txt
@@ -16,13 +16,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_SOURCE_DIR}/dependenc
 target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_SOURCE_DIR}/dependencies/emscripten-browser-file")
 target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/utils")
 
-if (WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Release")
-    message("Setting WIN32_EXECUTABLE to TRUE in Release mode")
-    set_target_properties(${PROJECT_NAME} PROPERTIES WIN32_EXECUTABLE TRUE)
-elseif (WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
-    message("Setting WIN32_EXECUTABLE to FALSE in Debug mode")
-    set_target_properties(${PROJECT_NAME} PROPERTIES WIN32_EXECUTABLE FALSE)
-endif ()
+set_target_properties(${PROJECT_NAME} PROPERTIES WIN32_EXECUTABLE $<CONFIG:Release>)
 
 if (NOT EMSCRIPTEN)
     find_package(glfw3 CONFIG REQUIRED)
@@ -54,10 +48,10 @@ target_link_libraries(${PROJECT_NAME} PRIVATE fmt::fmt)
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
     target_compile_definitions(${PROJECT_NAME} PRIVATE BUILD_DEBUG)
-    target_compile_definitions(${PROJECT_NAME} PRIVATE BUILD_CONFIG "$<$<CONFIG:Debug>:Debug>")
+    #    target_compile_definitions(${PROJECT_NAME} PRIVATE BUILD_CONFIG "$<$<CONFIG:Debug>:Debug>")
 else ()
     target_compile_definitions(${PROJECT_NAME} PRIVATE BUILD_RELEASE)
-    target_compile_definitions(${PROJECT_NAME} PRIVATE BUILD_CONFIG "$<$<CONFIG:Release>:Release>")
+    #    target_compile_definitions(${PROJECT_NAME} PRIVATE BUILD_CONFIG "$<$<CONFIG:Release>:Release>")
 endif ()
 
 if (WIN32)

diff --git a/Chip8topia/Chip8Emulator/Chip8Core/Chip8Core.cpp b/Chip8topia/Chip8Emulator/Chip8Core/Chip8Core.cpp
diff --git a/Chip8topia/Chip8Emulator/Chip8Core/Chip8Core.h b/Chip8topia/Chip8Emulator/Chip8Core/Chip8Core.h
diff --git a/Chip8topia/Chip8Emulator/Chip8Core/Chip8CoreBase.cpp b/Chip8topia/Chip8Emulator/Chip8Core/Chip8CoreBase.cpp
diff --git a/Chip8topia/Chip8Emulator/Chip8Core/Chip8CoreBase.h b/Chip8topia/Chip8Emulator/Chip8Core/Chip8CoreBase.h