Переглянути джерело

[build] Fix some warnings on web builds and remove some redundant flags. (#4069)

* update

* Revert "update"

This reverts commit e8adcabd94830be66938e12143c8fe23cdeab605.

* update

* remove a not stricly required flag
Lázaro Albuquerque 1 рік тому
батько
коміт
cc40a91343
3 змінених файлів з 3 додано та 5 видалено
  1. 0 1
      cmake/LibraryConfigurations.cmake
  2. 2 3
      examples/CMakeLists.txt
  3. 1 1
      src/CMakeLists.txt

+ 0 - 1
cmake/LibraryConfigurations.cmake

@@ -59,7 +59,6 @@ if (${PLATFORM} MATCHES "Desktop")
 elseif (${PLATFORM} MATCHES "Web")
     set(PLATFORM_CPP "PLATFORM_WEB")
     set(GRAPHICS "GRAPHICS_API_OPENGL_ES2")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 --profiling")
     set(CMAKE_STATIC_LIBRARY_SUFFIX ".a")
 
 elseif (${PLATFORM} MATCHES "Android")

+ 2 - 3
examples/CMakeLists.txt

@@ -96,10 +96,9 @@ if (${PLATFORM} MATCHES "Android")
     list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/shaders/shaders_basic_lighting.c)
 
 elseif (${PLATFORM} MATCHES "Web")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Os -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Os")    
     # 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(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s WASM=1 -s ASYNCIFY -s ALLOW_MEMORY_GROWTH=1 --shell-file ${CMAKE_SOURCE_DIR}/src/shell.html")
     set(CMAKE_EXECUTABLE_SUFFIX ".html")
 
     list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/others/raylib_opengl_interop.c)

+ 1 - 1
src/CMakeLists.txt

@@ -69,7 +69,7 @@ else()
 endif()
 
 if (${PLATFORM} MATCHES "Web")
-    target_link_options(raylib PRIVATE "-sUSE_GLFW=3")
+    target_link_options(raylib PUBLIC "-sUSE_GLFW=3")
 endif()
 
 set_target_properties(raylib PROPERTIES