Skip to content

Commit 007fedf

Browse files
Replaced PLATFORM_EMSCRIPTEN CMake variable and c++ macro with PLATFORM_WEB
1 parent 351839a commit 007fedf

File tree

10 files changed

+11
-11
lines changed

10 files changed

+11
-11
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.10)
22

33
file(RELATIVE_PATH DILIGENT_TOOLS_DIR "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
44

5-
if(PLATFORM_WIN32 OR PLATFORM_UNIVERSAL_WINDOWS OR PLATFORM_LINUX OR PLATFORM_MACOS OR PLATFORM_IOS OR PLATFORM_TVOS OR PLATFORM_EMSCRIPTEN)
5+
if(PLATFORM_WIN32 OR PLATFORM_UNIVERSAL_WINDOWS OR PLATFORM_LINUX OR PLATFORM_MACOS OR PLATFORM_IOS OR PLATFORM_TVOS OR PLATFORM_WEB)
66
option(DILIGENT_INSTALL_TOOLS "Install DiligentTool module headers and libraries" ON)
77
else()
88
set(DILIGENT_INSTALL_TOOLS OFF)

Imgui/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ elseif(PLATFORM_IOS)
4242
elseif(PLATFORM_TVOS)
4343
list(APPEND SOURCE src/ImGuiImplTVOS.mm)
4444
list(APPEND INTERFACE interface/ImGuiImplTVOS.hpp)
45-
elseif(PLATFORM_EMSCRIPTEN)
45+
elseif(PLATFORM_WEB)
4646
list(APPEND SOURCE src/ImGuiImplEmscripten.cpp)
4747
list(APPEND INTERFACE interface/ImGuiImplEmscripten.hpp)
4848
endif()

NativeApp/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ elseif(PLATFORM_TVOS)
391391
add_tvos_app("${TARGET_NAME}" "${SOURCE}" "${INCLUDE}" "${ASSETS}")
392392
endfunction()
393393

394-
elseif(PLATFORM_EMSCRIPTEN)
394+
elseif(PLATFORM_WEB)
395395
set(SOURCE
396396
src/Emscripten/EmscriptenAppBase.cpp
397397
src/Emscripten/EmscriptenMain.cpp
@@ -521,7 +521,7 @@ elseif(PLATFORM_TVOS)
521521
target_include_directories(Diligent-NativeAppBase PUBLIC
522522
include/TVOS
523523
)
524-
elseif(PLATFORM_EMSCRIPTEN)
524+
elseif(PLATFORM_WEB)
525525
target_include_directories(Diligent-NativeAppBase PUBLIC
526526
include/Emscripten
527527
)

NativeApp/include/NativeAppBase.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
using NativeAppBase = TVOSAppBase;
8585
}
8686

87-
#elif PLATFORM_EMSCRIPTEN
87+
#elif PLATFORM_WEB
8888

8989
#include "Emscripten/EmscriptenAppBase.hpp"
9090
namespace Diligent

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ To build the module, see [build instructions](https://github.com/DiligentGraphic
2525
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/macos-logo.png" width=24 valign="middle"> MacOS | [![Build Status](https://github.com/DiligentGraphics/DiligentTools/actions/workflows/build-apple.yml/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentTools/actions/workflows/build-apple.yml?query=branch%3Amaster) |
2626
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/apple-logo.png" width=24 valign="middle"> iOS | [![Build Status](https://github.com/DiligentGraphics/DiligentTools/actions/workflows/build-apple.yml/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentTools/actions/workflows/build-apple.yml?query=branch%3Amaster) |
2727
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/tvos-logo.png" width=24 valign="middle"> tvOS | [![Build Status](https://github.com/DiligentGraphics/DiligentTools/actions/workflows/build-apple.yml/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentTools/actions/workflows/build-apple.yml?query=branch%3Amaster) |
28-
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/emscripten-logo.png" width=24 valign="middle"> Emscripten | [![Build Status](https://github.com/DiligentGraphics/DiligentTools/actions/workflows/build-emscripten.yml/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentTools/actions/workflows/build-emscripten.yml?query=branch%3Amaster) |
28+
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/emscripten-logo.png" width=24 valign="middle"> Web | [![Build Status](https://github.com/DiligentGraphics/DiligentTools/actions/workflows/build-emscripten.yml/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentTools/actions/workflows/build-emscripten.yml?query=branch%3Amaster) |
2929

3030

3131
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](License.txt)

ThirdParty/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ if (NOT TARGET PNG::PNG)
5454
add_library(PNG::PNG ALIAS png_static)
5555
list(APPEND THIRD_PARTY_TARGETS png_static)
5656

57-
if (PLATFORM_EMSCRIPTEN)
57+
if (PLATFORM_WEB)
5858
set_targets_emscripten_properties(png_static)
5959
endif()
6060
endif()

ThirdParty/libtiff/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ set(SOURCE
4747

4848
if(PLATFORM_WIN32)
4949
list(APPEND SOURCE tif_win32.c)
50-
elseif(PLATFORM_ANDROID OR PLATFORM_UNIVERSAL_WINDOWS OR PLATFORM_LINUX OR PLATFORM_MACOS OR PLATFORM_IOS OR PLATFORM_TVOS OR PLATFORM_EMSCRIPTEN)
50+
elseif(PLATFORM_ANDROID OR PLATFORM_UNIVERSAL_WINDOWS OR PLATFORM_LINUX OR PLATFORM_MACOS OR PLATFORM_IOS OR PLATFORM_TVOS OR PLATFORM_WEB)
5151
list(APPEND SOURCE tif_unix.c)
5252
else()
5353
message(FATAL_ERROR "Unknown platform")

ThirdParty/libtiff/tif_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
# include "tif_config.android.h"
1212

13-
#elif PLATFORM_LINUX || PLATFORM_MACOS || PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_EMSCRIPTEN
13+
#elif PLATFORM_LINUX || PLATFORM_MACOS || PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_WEB
1414

1515
# include "tif_config.linux.h"
1616

ThirdParty/libtiff/tiffconf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# include "tiffconf.linux.h"
77
# endif
88

9-
#elif PLATFORM_ANDROID || PLATFORM_LINUX || PLATFORM_MACOS || PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_EMSCRIPTEN
9+
#elif PLATFORM_ANDROID || PLATFORM_LINUX || PLATFORM_MACOS || PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_WEB
1010

1111
# include "tiffconf.linux.h"
1212

ThirdParty/zlib.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ if(MSVC)
4949
target_compile_options(ZLib PRIVATE /W3 /wd4131 /wd4127 /wd4244 /wd4996)
5050
endif()
5151

52-
if(PLATFORM_LINUX OR PLATFORM_ANDROID OR PLATFORM_MACOS OR PLATFORM_IOS OR PLATFORM_TVOS OR PLATFORM_EMSCRIPTEN)
52+
if(PLATFORM_LINUX OR PLATFORM_ANDROID OR PLATFORM_MACOS OR PLATFORM_IOS OR PLATFORM_TVOS OR PLATFORM_WEB)
5353
target_compile_definitions(ZLib PRIVATE HAVE_UNISTD_H)
5454
endif()
5555

0 commit comments

Comments
 (0)