Skip to content

Commit cca14dc

Browse files
authored
Merge branch 'compiler-research:main' into main
2 parents 2a047c3 + 98585e8 commit cca14dc

File tree

4 files changed

+108
-0
lines changed

4 files changed

+108
-0
lines changed

.github/workflows/deploy-github-page.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ jobs:
6161
-DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \
6262
-DCMAKE_FIND_ROOT_PATH=$PREFIX \
6363
-DSYSROOT_PATH=$SYSROOT_PATH \
64+
-DCMAKE_COMPILE_WARNING_AS_ERROR=ON \
6465
..
6566
emmake make -j ${{ env.ncpus }} install
6667
@@ -74,6 +75,7 @@ jobs:
7475
--XeusAddon.prefix=${{ env.PREFIX }} \
7576
--contents README.md \
7677
--contents notebooks/xeus-cpp-lite-demo.ipynb \
78+
--contents notebooks/smallpt.ipynb \
7779
--contents notebooks/images/marie.png \
7880
--contents notebooks/audio/audio.wav \
7981
--output-dir dist

.github/workflows/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ jobs:
244244
-DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \
245245
-DCMAKE_FIND_ROOT_PATH=$PREFIX \
246246
-DSYSROOT_PATH=$SYSROOT_PATH \
247+
-DCMAKE_COMPILE_WARNING_AS_ERROR=ON \
247248
..
248249
emmake make -j ${{ env.ncpus }} install
249250

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,7 @@ if(EMSCRIPTEN)
436436
xeus_wasm_compile_options(xcpp)
437437
xeus_wasm_link_options(xcpp "web,worker")
438438
target_link_options(xcpp
439+
PUBLIC "SHELL: -s USE_SDL=2"
439440
PUBLIC "SHELL: --preload-file ${SYSROOT_PATH}/include@/include"
440441
#PUBLIC "SHELL: --preload-file ${CMAKE_INSTALL_PREFIX}${XEUS_CPP_RESOURCE_DIR}@${XEUS_CPP_RESOURCE_DIR}"
441442
PUBLIC "SHELL: --preload-file ${XEUS_CPP_DATA_DIR}@/share/xeus-cpp"

notebooks/smallpt.ipynb

Lines changed: 104 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)