Merge pull request #38 from Im-Rises/develop

wip

Author: Im-Rises

.github/workflows/cmake-vcpkg-emscripten-publish.yml

@@ -29,8 +29,9 @@ jobs:
       - name: Install vcpgk
         uses: lukka/run-vcpkg@v11
         with:
+          vcpkgGitCommitId: 47364fbc300756f64f7876b549d9422d5f3ec0d3
           vcpkgDirectory: ${{ github.workspace }}/vcpkg
-          runVcpkgInstall: true
+      #          runVcpkgInstall: true
 
       - name: Install emsdk
         uses: mymindstorm/setup-emsdk@v11

.github/workflows/cmake-vcpkg-emscripten.yml

@@ -28,11 +28,15 @@ jobs:
           sudo apt-get install -y xorg-dev
           sudo apt-get install -y libglu1-mesa-dev
 
+      - uses: lukka/get-cmake@latest
+
       - name: Install vcpgk
         uses: lukka/run-vcpkg@v11
         with:
+          vcpkgGitCommitId: 47364fbc300756f64f7876b549d9422d5f3ec0d3
           vcpkgDirectory: ${{ github.workspace }}/vcpkg
-          runVcpkgInstall: true
+      #          runVcpkgInstall: true
+      #          vcpkgJsonGlob: '**/vcpkg.json'
 
       - name: Install emsdk
         uses: mymindstorm/setup-emsdk@v11

.github/workflows/cmake-vcpkg-publish-binaries.yml

@@ -95,6 +95,7 @@ jobs:
       - name: Install vcpgk
         uses: lukka/run-vcpkg@v11
         with:
+          vcpkgGitCommitId: 47364fbc300756f64f7876b549d9422d5f3ec0d3
           vcpkgDirectory: ${{ github.workspace }}/vcpkg
           runVcpkgInstall: true
 

.github/workflows/cmake-vcpkg.yml

@@ -51,6 +51,7 @@ jobs:
       - name: Install vcpgk
         uses: lukka/run-vcpkg@v11
         with:
+          vcpkgGitCommitId: 47364fbc300756f64f7876b549d9422d5f3ec0d3
           vcpkgDirectory: ${{ github.workspace }}/vcpkg
           runVcpkgInstall: true
 

Chip8topia/CMakeLists.txt

@@ -50,43 +50,9 @@ if (NOT EMSCRIPTEN)
     endif ()
 else ()
     target_link_libraries(${PROJECT_NAME} PRIVATE SDL2::SDL2 SDL2::SDL2main)
-    #[[
-        --preload-file ${CMAKE_SOURCE_DIR}/Chip8Games@/Chip8Games
-        --preload-file ${CMAKE_SOURCE_DIR}/shaders@/shaders
-        --preload-file ${CMAKE_SOURCE_DIR}/fonts@/fonts
-    #]]
-
     set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-s USE_SDL=2 -s FULL_ES3=1 -s WASM=1 -s EXPORTED_RUNTIME_METHODS=[ccall] -s ALLOW_MEMORY_GROWTH=1 -s EXPORTED_FUNCTIONS=[_main,_malloc,_free] --preload-file ${CMAKE_SOURCE_DIR}/Chip8Games@/Chip8Games --preload-file ${CMAKE_SOURCE_DIR}/shaders@/shaders --preload-file ${CMAKE_SOURCE_DIR}/fonts@/fonts -sNO_DISABLE_EXCEPTION_CATCHING")
-
     target_link_options(${PROJECT_NAME} PRIVATE -sNO_DISABLE_EXCEPTION_CATCHING)
-
     target_compile_options(${PROJECT_NAME} PRIVATE -sNO_DISABLE_EXCEPTION_CATCHING)
-
-    ### Code above work except for exceptions...
-
-    #    target_compile_options(${PROJECT_NAME} PRIVATE -fwasm-exceptions)
-    #
-    #    target_link_options(${PROJECT_NAME} PRIVATE
-    #            "-s USE_SDL=2"
-    #            "-s FULL_ES3=1"
-    #            "-s WASM=1"
-    #            "-s EXPORTED_RUNTIME_METHODS=[ccall]"
-    #            "-s ALLOW_MEMORY_GROWTH=1"
-    #            "-s EXPORTED_FUNCTIONS=[_main,_malloc,_free]"
-    #            "-fwasm-exceptions"
-    #    )
-
-    #    set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS
-    #            --preload-file ${CMAKE_SOURCE_DIR}/Chip8Games@/Chip8Games
-    #            --preload-file ${CMAKE_SOURCE_DIR}/shaders@/shaders
-    #            --preload-file ${CMAKE_SOURCE_DIR}/fonts@/fonts
-    #    )
-
-    #    set_target_properties(${PROJECT_NAME} PROPERTIES
-    #            --preload-file ${CMAKE_SOURCE_DIR}/Chip8Games@/Chip8Games;${CMAKE_SOURCE_DIR}/shaders@/shaders;${CMAKE_SOURCE_DIR}/fonts@/fonts
-    #    )
-
-
 endif ()
 
 find_package(imgui CONFIG REQUIRED)