Replaced PLATFORM_EMSCRIPTEN CMake option and c++ macro with PLATFORM_WEB

Author: TheMostDiligent

BuildTools/CMake/BuildUtils.cmake

@@ -210,7 +210,7 @@ function(set_common_target_properties TARGET)
         endif()
     endif() # if(MSVC)
 
-    if (PLATFORM_EMSCRIPTEN)
+    if (PLATFORM_WEB)
         if((${CMAKE_BUILD_TYPE} STREQUAL "Debug") AND (TARGET_TYPE STREQUAL EXECUTABLE) AND DILIGENT_EMSCRIPTEN_STRIP_DEBUG_INFO)
             # Strip debug info from WebAssembly binary. Without this option, the toolchain crashes on CI.
             target_link_options(${TARGET} PRIVATE "SHELL: -gseparate-dwarf -g0")
@@ -249,7 +249,7 @@ endfunction()
 function(get_backend_libraries_type _LIB_TYPE)
     if(PLATFORM_WIN32 OR PLATFORM_LINUX OR PLATFORM_ANDROID OR PLATFORM_UNIVERSAL_WINDOWS OR PLATFORM_MACOS)
         set(LIB_TYPE "shared")
-    elseif(PLATFORM_IOS OR PLATFORM_TVOS OR PLATFORM_EMSCRIPTEN)
+    elseif(PLATFORM_IOS OR PLATFORM_TVOS OR PLATFORM_WEB)
         # Statically link with the engine on iOS, tvOS and Emscripten.
         # It is also possible to link dynamically by
         # putting the library into the framework.
@@ -464,7 +464,7 @@ macro(FetchContent_DeclareShallowGit Name GIT_REPOSITORY GitRepository GIT_TAG G
 endmacro()
 
 function(set_targets_emscripten_properties)
-    if (PLATFORM_EMSCRIPTEN)
+    if (PLATFORM_WEB)
         foreach(_TARGET IN LISTS ARGN)
             get_target_property(_TARGET_TYPE ${_TARGET} TYPE)
             if (_TARGET_TYPE STREQUAL "STATIC_LIBRARY")

CMakeLists.txt

@@ -47,6 +47,7 @@ set(PLATFORM_LINUX             FALSE CACHE INTERNAL "")
 set(PLATFORM_MACOS             FALSE CACHE INTERNAL "")
 set(PLATFORM_IOS               FALSE CACHE INTERNAL "")
 set(PLATFORM_TVOS              FALSE CACHE INTERNAL "")
+set(PLATFORM_WEB               FALSE CACHE INTERNAL "")
 set(PLATFORM_EMSCRIPTEN        FALSE CACHE INTERNAL "")
 set(D3D11_SUPPORTED            FALSE CACHE INTERNAL "D3D11 is not supported")
 set(D3D12_SUPPORTED            FALSE CACHE INTERNAL "D3D12 is not supported")
@@ -141,8 +142,9 @@ else()
         set(PLATFORM_TVOS TRUE CACHE INTERNAL "Target platform: tvOS")
         message("Target platform: tvOS " ${ARCH})
     elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
-        set(PLATFORM_EMSCRIPTEN TRUE CACHE INTERNAL "Target platform: Emscripten")
-        message("Target platform: Emscripten " ${ARCH})
+        set(PLATFORM_WEB TRUE CACHE INTERNAL "Target platform: Web")
+        set(PLATFORM_EMSCRIPTEN TRUE CACHE INTERNAL "Build with Emscritpen")
+        message("Target platform: Web " ${ARCH})
     else()
         message(FATAL_ERROR "Unsupported platform")
     endif()
@@ -210,11 +212,11 @@ elseif(PLATFORM_IOS)
     target_compile_definitions(Diligent-PublicBuildSettings INTERFACE PLATFORM_IOS=1 PLATFORM_APPLE=1)
 elseif(PLATFORM_TVOS)
     target_compile_definitions(Diligent-PublicBuildSettings INTERFACE PLATFORM_TVOS=1 PLATFORM_APPLE=1)
-elseif(PLATFORM_EMSCRIPTEN)
-    set(GLES_SUPPORTED     TRUE CACHE INTERNAL "OpenGLES is supported on Emscripten platform")
-    set(WEBGPU_SUPPORTED   TRUE CACHE INTERNAL "WebGPU is supported on Emscripten platform")
-    set(ARCHIVER_SUPPORTED TRUE CACHE INTERNAL "Archiver is supported on Emscripten platform")
-    target_compile_definitions(Diligent-PublicBuildSettings INTERFACE PLATFORM_EMSCRIPTEN=1)   
+elseif(PLATFORM_WEB)
+    set(GLES_SUPPORTED     TRUE CACHE INTERNAL "OpenGLES is supported on Web platform")
+    set(WEBGPU_SUPPORTED   TRUE CACHE INTERNAL "WebGPU is supported on Web platform")
+    set(ARCHIVER_SUPPORTED TRUE CACHE INTERNAL "Archiver is supported on Web platform")
+    target_compile_definitions(Diligent-PublicBuildSettings INTERFACE PLATFORM_WEB=1 PLATFORM_EMSCRIPTEN=1)   
 else()
     message(FATAL_ERROR "No PLATFORM_XXX variable defined. Make sure that 'DiligentCore' folder is processed first")
 endif()
@@ -268,7 +270,7 @@ if(PLATFORM_APPLE)
     endif()
 endif()
 
-if(PLATFORM_WIN32 OR PLATFORM_LINUX OR PLATFORM_MACOS OR PLATFORM_EMSCRIPTEN)
+if(PLATFORM_WIN32 OR PLATFORM_LINUX OR PLATFORM_MACOS OR PLATFORM_WEB)
     option(DILIGENT_BUILD_TESTS "Build Diligent Engine tests" OFF)
     if(DILIGENT_BUILD_TESTS)
         set(DILIGENT_BUILD_CORE_TESTS    TRUE CACHE INTERNAL "Build Core tests")
@@ -299,7 +301,7 @@ option(DILIGENT_NO_DIRECT3D12        "Disable Direct3D12 backend" OFF)
 option(DILIGENT_NO_OPENGL            "Disable OpenGL/GLES backend" OFF)
 option(DILIGENT_NO_VULKAN            "Disable Vulkan backend" OFF)
 option(DILIGENT_NO_METAL             "Disable Metal backend" OFF)
-if (PLATFORM_EMSCRIPTEN)
+if (PLATFORM_WEB)
     option(DILIGENT_NO_WEBGPU        "Disable WebGPU backend" OFF)
 else()
     option(DILIGENT_NO_WEBGPU        "Disable WebGPU backend" ON)
@@ -370,7 +372,7 @@ endif()
 
 add_library(Diligent-BuildSettings INTERFACE)
 
-if (PLATFORM_EMSCRIPTEN)
+if (PLATFORM_WEB)
     target_compile_options(Diligent-BuildSettings INTERFACE
         "-pthread"
         "-mbulk-memory"

Common/interface/StringTools.hpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -95,7 +95,7 @@ inline std::wstring WidenString(const std::string& Str)
 
 inline int StrCmpNoCase(const char* Str1, const char* Str2, size_t NumChars)
 {
-#if PLATFORM_ANDROID || PLATFORM_LINUX || PLATFORM_MACOS || PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_EMSCRIPTEN
+#if PLATFORM_ANDROID || PLATFORM_LINUX || PLATFORM_MACOS || PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_WEB
 #    define _strnicmp strncasecmp
 #endif
 
@@ -104,7 +104,7 @@ inline int StrCmpNoCase(const char* Str1, const char* Str2, size_t NumChars)
 
 inline int StrCmpNoCase(const char* Str1, const char* Str2)
 {
-#if PLATFORM_ANDROID || PLATFORM_LINUX || PLATFORM_MACOS || PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_EMSCRIPTEN
+#if PLATFORM_ANDROID || PLATFORM_LINUX || PLATFORM_MACOS || PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_WEB
 #    define _stricmp strcasecmp
 #endif
 

Graphics/Archiver/CMakeLists.txt

@@ -148,7 +148,7 @@ if(GL_SUPPORTED OR GLES_SUPPORTED)
         target_link_libraries(Diligent-Archiver-static PRIVATE GLEW::glew OpenGL::GL)
     elseif(PLATFORM_ANDROID)
         target_link_libraries(Diligent-Archiver-static PRIVATE GLESv3 EGL)
-    elseif(PLATFORM_EMSCRIPTEN)
+    elseif(PLATFORM_WEB)
     else()
         message(FATAL_ERROR "Unsupported platform")
     endif()
@@ -167,7 +167,7 @@ endif()
 
 if(WEBGPU_SUPPORTED)
     target_link_libraries(Diligent-Archiver-static PRIVATE Diligent-GraphicsEngineWebGPU-static)
-    if (NOT PLATFORM_EMSCRIPTEN)
+    if (NOT PLATFORM_WEB)
         target_link_libraries(Diligent-Archiver-static PRIVATE dawn_native dawn_proc)
     endif()
     target_include_directories(Diligent-Archiver-static

Graphics/Archiver/interface/ArchiverFactoryLoader.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2024 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
 
 #include "ArchiverFactory.h"
 
-#if PLATFORM_ANDROID || PLATFORM_LINUX || PLATFORM_MACOS || PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_EMSCRIPTEN || (PLATFORM_WIN32 && !defined(_MSC_VER))
+#if PLATFORM_ANDROID || PLATFORM_LINUX || PLATFORM_MACOS || PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_WEB || (PLATFORM_WIN32 && !defined(_MSC_VER))
 // https://gcc.gnu.org/wiki/Visibility
 #    define API_QUALIFIER __attribute__((visibility("default")))
 #elif PLATFORM_WIN32 || PLATFORM_UNIVERSAL_WINDOWS

Graphics/GraphicsEngine/interface/GraphicsTypes.h

@@ -3546,7 +3546,7 @@ struct EngineCreateInfo
 };
 typedef struct EngineCreateInfo EngineCreateInfo;
 
-#if PLATFORM_EMSCRIPTEN
+#if PLATFORM_WEB
 /// WebGL power preference.
 DILIGENT_TYPED_ENUM(WEBGL_POWER_PREFERENCE, Uint8)
 {
@@ -3626,7 +3626,7 @@ struct EngineGLCreateInfo DILIGENT_DERIVE(EngineCreateInfo)
     /// * On Linux this affects the `DRI_PRIME` environment variable that is used by Mesa drivers that support PRIME.
     ADAPTER_TYPE PreferredAdapterType DEFAULT_INITIALIZER(ADAPTER_TYPE_UNKNOWN);
 
-#if PLATFORM_EMSCRIPTEN
+#if PLATFORM_WEB
     /// WebGL context attributes.
     WebGLContextAttribs WebGLAttribs;
 #endif

Graphics/GraphicsEngineOpenGL/CMakeLists.txt

@@ -143,7 +143,7 @@ elseif(PLATFORM_IOS)
     list(APPEND INCLUDE include/GLStubsIOS.h)
     list(APPEND SOURCE src/SwapChainGLIOS.mm)
     list(APPEND INCLUDE include/SwapChainGLIOS.hpp)
-elseif(PLATFORM_EMSCRIPTEN)
+elseif(PLATFORM_WEB)
     list(APPEND SOURCE src/GLContextEmscripten.cpp)
     list(APPEND SOURCE src/RenderDeviceGLESImpl.cpp)
     list(APPEND SOURCE src/SwapChainGLImpl.cpp)
@@ -213,7 +213,7 @@ elseif(PLATFORM_MACOS)
     set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} GLEW::glew OpenGL::GL)
 elseif(PLATFORM_IOS)
     set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} ${OPENGLES})
-elseif(PLATFORM_EMSCRIPTEN)
+elseif(PLATFORM_WEB)
 else()
     message(FATAL_ERROR "Unknown platform")
 endif()
@@ -274,7 +274,7 @@ if(PLATFORM_MACOS)
 elseif(PLATFORM_IOS)
     # Silence GLES deprecation warnings
     target_compile_definitions(Diligent-GraphicsEngineOpenGL-static PUBLIC GLES_SILENCE_DEPRECATION)
-elseif(PLATFORM_EMSCRIPTEN)
+elseif(PLATFORM_WEB)
     target_link_options(Diligent-GraphicsEngineOpenGL-static PUBLIC "SHELL: -s FULL_ES3=1 -s USE_PTHREADS=1")
 endif()
 

Graphics/GraphicsEngineOpenGL/include/BufferGLImpl.hpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2024 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -95,7 +95,7 @@ class BufferGLImpl final : public BufferBase<EngineGLImplTraits>, public AsyncWr
     const Uint32                  m_BindTarget;
     const GLenum                  m_GLUsageHint;
 
-#if PLATFORM_EMSCRIPTEN
+#if PLATFORM_WEB
     struct MappedData
     {
         std::vector<Uint8> Data;

Graphics/GraphicsEngineOpenGL/include/EngineGLImplTraits.hpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2024 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -85,7 +85,7 @@ struct EngineGLImplTraits
 {
 #if PLATFORM_WIN32 || PLATFORM_LINUX || PLATFORM_MACOS
     static constexpr auto DeviceType = RENDER_DEVICE_TYPE_GL;
-#elif PLATFORM_ANDROID || PLATFORM_IOS || PLATFORM_EMSCRIPTEN
+#elif PLATFORM_ANDROID || PLATFORM_IOS || PLATFORM_WEB
     static constexpr auto DeviceType = RENDER_DEVICE_TYPE_GL;
 #else
 #    error Unsupported platform

Graphics/GraphicsEngineOpenGL/include/GLContext.hpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +37,7 @@
 #    include "GLContextMacOS.hpp"
 #elif PLATFORM_IOS
 #    include "GLContextIOS.hpp"
-#elif PLATFORM_EMSCRIPTEN
+#elif PLATFORM_WEB
 #    include "GLContextEmscripten.hpp"
 #else
 #    error Unsupported platform