Merge branch 'develop' into release/0.15.0

guillaumeblanc · Mar 2, 2024 · c4cc5b5 · c4cc5b5
2 parents bb1308f + 43aea89
commit c4cc5b5
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 14 deletions.
diff --git a/samples/additive/CMakeLists.txt b/samples/additive/CMakeLists.txt
@@ -36,7 +36,7 @@ set_target_properties(sample_additive
 if(EMSCRIPTEN)
   # Resource files are embedded to the output file with emscripten
   set_target_properties(sample_additive
-    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md --memory-init-file 0")
+    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md")
 
   install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/sample_additive.html

diff --git a/samples/attach/CMakeLists.txt b/samples/attach/CMakeLists.txt
@@ -28,7 +28,7 @@ set_target_properties(sample_attach
 if(EMSCRIPTEN)
   # Resource files are embedded to the output file with emscripten
   set_target_properties(sample_attach
-    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md --memory-init-file 0")
+    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md")
 
   install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/sample_attach.html

diff --git a/samples/baked/CMakeLists.txt b/samples/baked/CMakeLists.txt
@@ -31,7 +31,7 @@ set_target_properties(sample_baked
 if(EMSCRIPTEN)
   # Resource files are embedded to the output file with emscripten
   set_target_properties(sample_baked
-    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md --memory-init-file 0")
+    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md")
 
   install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/sample_baked.html

diff --git a/samples/blend/CMakeLists.txt b/samples/blend/CMakeLists.txt
@@ -39,7 +39,7 @@ set_target_properties(sample_blend
 if(EMSCRIPTEN)
   # Resource files are embedded to the output file with emscripten
   set_target_properties(sample_blend
-    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md --memory-init-file 0")
+    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md")
 
   install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/sample_blend.html

diff --git a/samples/foot_ik/CMakeLists.txt b/samples/foot_ik/CMakeLists.txt
@@ -37,7 +37,7 @@ set_target_properties(sample_foot_ik
 if(EMSCRIPTEN)
   # Resource files are embedded to the output file with emscripten
   set_target_properties(sample_foot_ik
-    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md --memory-init-file 0")
+    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md")
 
   install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/sample_foot_ik.html

diff --git a/samples/look_at/CMakeLists.txt b/samples/look_at/CMakeLists.txt
@@ -33,7 +33,7 @@ set_target_properties(sample_look_at
 if(EMSCRIPTEN)
   # Resource files are embedded to the output file with emscripten
   set_target_properties(sample_look_at
-    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md --memory-init-file 0")
+    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md")
 
   install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/sample_look_at.html

diff --git a/samples/millipede/CMakeLists.txt b/samples/millipede/CMakeLists.txt
@@ -17,7 +17,7 @@ set_target_properties(sample_millipede
 
 if(EMSCRIPTEN)
   set_target_properties(sample_millipede
-    PROPERTIES LINK_FLAGS "--embed-file README.md --memory-init-file 0")
+    PROPERTIES LINK_FLAGS "--embed-file README.md")
 
   install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/sample_millipede.html

diff --git a/samples/multithread/CMakeLists.txt b/samples/multithread/CMakeLists.txt
@@ -41,7 +41,7 @@ if(EMSCRIPTEN)
 
   # Resource files are embedded to the output file with emscripten
   set_target_properties(sample_multithread
-    PROPERTIES LINK_FLAGS "-s TOTAL_MEMORY=100663296 -s USE_PTHREADS=1 --embed-file media --embed-file README.md --memory-init-file 0")
+    PROPERTIES LINK_FLAGS "-s TOTAL_MEMORY=100663296 -s USE_PTHREADS=1 --embed-file media --embed-file README.md")
 
   install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/sample_multithread.html

diff --git a/samples/optimize/CMakeLists.txt b/samples/optimize/CMakeLists.txt
@@ -28,7 +28,7 @@ set_target_properties(sample_optimize
 if(EMSCRIPTEN)
   # Resource files are embedded to the output file with emscripten.
   set_target_properties(sample_optimize
-    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md --memory-init-file 0")
+    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md")
 
   install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/sample_optimize.html

diff --git a/samples/partial_blend/CMakeLists.txt b/samples/partial_blend/CMakeLists.txt
@@ -31,7 +31,7 @@ set_target_properties(sample_partial_blend
 if(EMSCRIPTEN)
   # Resource files are embedded to the output file with emscripten
   set_target_properties(sample_partial_blend
-    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md --memory-init-file 0")
+    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md")
 
   install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/sample_partial_blend.html

diff --git a/samples/playback/CMakeLists.txt b/samples/playback/CMakeLists.txt
@@ -28,7 +28,7 @@ set_target_properties(sample_playback
 if(EMSCRIPTEN)
   # Resource files are embedded to the output file with emscripten
   set_target_properties(sample_playback
-    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md --memory-init-file 0")
+    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md")
 
   install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/sample_playback.html

diff --git a/samples/skinning/CMakeLists.txt b/samples/skinning/CMakeLists.txt
@@ -33,7 +33,7 @@ set_target_properties(sample_skinning
 if(EMSCRIPTEN)
   # Resource files are embedded to the output file with emscripten
   set_target_properties(sample_skinning
-    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md --memory-init-file 0")
+    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md")
 
   install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/sample_skinning.html

diff --git a/samples/two_bone_ik/CMakeLists.txt b/samples/two_bone_ik/CMakeLists.txt
@@ -25,7 +25,7 @@ set_target_properties(sample_two_bone_ik
 if(EMSCRIPTEN)
   # Resource files are embedded to the output file with emscripten
   set_target_properties(sample_two_bone_ik
-    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md --memory-init-file 0")
+    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md")
 
   install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/sample_two_bone_ik.html

diff --git a/samples/user_channel/CMakeLists.txt b/samples/user_channel/CMakeLists.txt
@@ -32,7 +32,7 @@ set_target_properties(sample_user_channel
 if(EMSCRIPTEN)
   # Resource files are embedded to the output file with emscripten
   set_target_properties(sample_user_channel
-    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md --memory-init-file 0")
+    PROPERTIES LINK_FLAGS "--embed-file media --embed-file README.md")
 
   install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/sample_user_channel.html