diff options
| author | Pablo Marcos Oltra <pablo.marcos.oltra@gmail.com> | 2019-11-01 19:09:38 +0100 |
|---|---|---|
| committer | Ray <raysan5@gmail.com> | 2019-11-01 19:09:38 +0100 |
| commit | 5d9df629d79458423faf249b952e595ed68d669b (patch) | |
| tree | 3f07e3c143877db6bc52084c17fac214f5e5dac0 | |
| parent | dc6136e820a5793fb469e78154b57a46ac619139 (diff) | |
| download | raylib-5d9df629d79458423faf249b952e595ed68d669b.tar.gz raylib-5d9df629d79458423faf249b952e595ed68d669b.zip | |
Fix generation of web examples (#1007)
At least on Linux, CMake seems to add automatically
the '-rdynamic' flag. As a result, Emscripten
generates a fat HTML file that does not work.
Removing it allows HTML+JS+WASM generation.
| -rw-r--r-- | examples/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | games/CMakeLists.txt | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index e0cf0a86..2879320c 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -85,9 +85,12 @@ elseif(${PLATFORM} MATCHES "Web") # Since WASM is used, ALLOW_MEMORY_GROWTH has no extra overheads set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s ALLOW_MEMORY_GROWTH=1 --no-heap-copy") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --shell-file ${CMAKE_SOURCE_DIR}/src/shell.html") - set(OUTPUT_EXT ".html") + # Remove the -rdynamic flag because otherwise emscripten + # does not generate HTML+JS+WASM files, only a non-working + # and fat HTML + string(REPLACE "-rdynamic" "" CMAKE_SHARED_LIBRARY_LINK_C_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS}) endif() include_directories(BEFORE SYSTEM others/external/include) diff --git a/games/CMakeLists.txt b/games/CMakeLists.txt index 3ec6cb29..90a5ed08 100644 --- a/games/CMakeLists.txt +++ b/games/CMakeLists.txt @@ -10,6 +10,11 @@ if(${PLATFORM} MATCHES "Web") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Os -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s EMTERPRETIFY=1 -s EMTERPRETIFY_ASYNC=1") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --shell-file ${CMAKE_SOURCE_DIR}/src/shell.html") set(OUTPUT_EXT ".html") + + # Remove the -rdynamic flag because otherwise emscripten + # does not generate HTML+JS+WASM files, only a non-working + # and fat HTML + string(REPLACE "-rdynamic" "" CMAKE_SHARED_LIBRARY_LINK_C_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS}) endif() if (NOT TARGET raylib) |