Update emsdk

tobanteAudio · Oct 14, 2023 · 636ae9a · 636ae9a
1 parent d4b3762
commit 636ae9a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml
@@ -38,5 +38,5 @@ jobs:
           -s build_type=Release
           .
 
-      # - name: Build & Test
-      #   run: conan build -bf build .
+      - name: Build & Test
+        run: conan build -bf build .
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,7 +32,7 @@ include(MociCompilerOptions)
 include(MociCompilerWarnings)
 
 if(EMSCRIPTEN)
-  add_subdirectory(playground/sdl_emscripten)
+  add_subdirectory(src/app/playground/sdl_emscripten)
 else()
   include(MociConan)
 

diff --git a/profiles/emscripten.profile b/profiles/emscripten.profile
@@ -4,12 +4,13 @@ arch=wasm
 
 compiler=clang
 compiler.version=16
+compiler.cppstd=20
 compiler.libcxx=libc++
 
 [options]
 
 [tool_requires]
-emsdk/3.1.23
+emsdk/3.1.44
 
 [env]
 

diff --git a/src/app/playground/sdl_emscripten/CMakeLists.txt b/src/app/playground/sdl_emscripten/CMakeLists.txt
@@ -12,6 +12,7 @@ add_executable(sdl_emscripten
     ${CMAKE_BINARY_DIR}/bindings/imgui_impl_opengl3.cpp
 )
 
+set_target_properties(sdl_emscripten PROPERTIES SUFFIX ".html")
 target_include_directories(sdl_emscripten PRIVATE ${CMAKE_BINARY_DIR})
 target_compile_definitions(sdl_emscripten PRIVATE IMGUI_DISABLE_OBSOLETE_FUNCTIONS)
 target_link_libraries(sdl_emscripten PRIVATE imgui::imgui)