build fixes

nesbox · Jan 26, 2025 · 4701fa3 · 4701fa3
1 parent 2bf00c9
commit 4701fa3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
         shell: cmd
         run: |
           cd build
-          cmake -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=MinSizeRel ..
+          cmake -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=MinSizeRel ..
           cmake --build . --config MinSizeRel --parallel
 
       - name: Deploy
@@ -33,7 +33,7 @@ jobs:
             build/bin/tic80.exe
 
   # === Ubuntu ===
-  linux-gcc12-glibc235:
+  linux:
     runs-on: ubuntu-22.04
 
     steps:
@@ -45,7 +45,7 @@ jobs:
       - name: Install
         run: |
           sudo apt-get update
-          sudo apt-get install gcc-12 g++-12 libglu1-mesa-dev libasound2-dev libpulse-dev libaudio-dev libsamplerate0-dev libcurl4-openssl-dev -y
+          sudo apt-get install gcc-12 g++-12 libxi-dev libasound2-dev -y
           sudo ln -s -f /usr/bin/gcc-12 /usr/bin/gcc
           sudo ln -s -f /usr/bin/g++-12 /usr/bin/g++
           

diff --git a/cmake/sokol.cmake b/cmake/sokol.cmake
@@ -72,6 +72,11 @@ if(BUILD_SOKOL)
         add_executable(tic80 ${TIC80_SRC})
     endif()
 
+    if(EMSCRIPTEN)
+        set_target_properties(tic80 PROPERTIES LINK_FLAGS "-s USE_WEBGPU=1 -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 -s FETCH=1 --pre-js ${CMAKE_SOURCE_DIR}/build/html/prejs.js -lidbfs.js")
+    endif()
+
+
     target_include_directories(tic80 PRIVATE
         ${CMAKE_SOURCE_DIR}/include
         ${CMAKE_SOURCE_DIR}/src