Revert "better workflow for wasm compilation"

This reverts commit 56f1b321c0.
This commit is contained in:
arthur.jamet
2021-06-03 12:01:39 +02:00
parent 173f787975
commit c1be763a9b
4 changed files with 8 additions and 6 deletions
+4 -2
View File
@@ -1,10 +1,12 @@
name: Web Build (Emscripten)
on: [push, pull_request]
on:
push:
branches:
wasm
jobs:
Push:
runs-on: ubuntu-latest
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
steps:
- uses: actions/checkout@v1
with:
+2 -2
View File
@@ -4,5 +4,5 @@ cmake-build-debug
.vscode
build/*
docs/*
emsdk*/
build_web/
emsdk/*
build_web/*
+1 -1
View File
@@ -13,7 +13,7 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/lib/Ray)
if (EMSCRIPTEN)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s NO_DISABLE_EXCEPTION_CATCHING --preload-file ../assets")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s NO_DISABLE_EXCEPTION_CATCHING --shell-file ../sources/wasm/frontend.html --preload-file ../assets")
set(CMAKE_EXECUTABLE_SUFFIX ".html")
endif ()
+1 -1
View File
@@ -1,5 +1,5 @@
<!doctype html>
<html lang="fr">
<html lang="en-us">
<head>
<meta charset="utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">