Skip to content

Commit a3d395c

Browse files
author
Julian LALU
committed
Improve Emscripten
1 parent 40d24e7 commit a3d395c

File tree

12 files changed

+24
-26
lines changed

12 files changed

+24
-26
lines changed

‎interface/core/bits/bits.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#if defined(HD_OS_WINDOWS)
55
#include "bits_windows.h"
6-
#elif defined(HD_OS_LINUX) || defined(HD_OS_BROWSER)
6+
#elif defined(HD_OS_LINUX) || defined(HD_OS_EMSCRIPTEN)
77
#include "bits_linux.h"
88
#else
99
#error Targeted OS not supported
@@ -15,7 +15,7 @@ namespace hud
1515
struct bits :
1616
#if defined(HD_OS_WINDOWS)
1717
hud::windows::bits
18-
#elif defined(HD_OS_LINUX) || defined(HD_OS_BROWSER)
18+
#elif defined(HD_OS_LINUX) || defined(HD_OS_EMSCRIPTEN)
1919
hud::linux::bits
2020
#endif
2121
{

‎interface/core/bits/bits_linux.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define HD_INC_CORE_BITS_BITS_LINUX_H
33
#include "bits_common.h"
44

5-
#if !defined(HD_OS_LINUX) && !defined(HD_OS_BROWSER)
5+
#if !defined(HD_OS_LINUX) && !defined(HD_OS_EMSCRIPTEN)
66
#error This file must be included only when targetting Linux OS
77
#endif
88

‎interface/core/compilation.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace hud
2121
{
2222
windows,
2323
linux,
24-
browser,
24+
emscripten,
2525
unknown,
2626
};
2727

@@ -158,8 +158,8 @@ namespace hud
158158
return os_e::windows;
159159
#elif defined(HD_OS_LINUX)
160160
return os_e::linux;
161-
#elif defined(HD_OS_BROWSER)
162-
return os_e::browser;
161+
#elif defined(HD_OS_EMSCRIPTEN)
162+
return os_e::emscripten;
163163
#else
164164
return os_e::unknown;
165165
#endif

‎interface/core/compiler_defines.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ __aarch64__
5252
#elif defined(__linux__)
5353
#define HD_OS_LINUX
5454
#elif defined(__EMSCRIPTEN__)
55-
#define HD_OS_BROWSER
55+
#define HD_OS_EMSCRIPTEN
5656
#else
5757
#error Unknown target OS defines
5858
#endif
@@ -149,7 +149,7 @@ __aarch64__
149149
#else
150150
#error Unknown endianness defines
151151
#endif
152-
#elif defined(HD_OS_BROWSER)
152+
#elif defined(HD_COMPILER_EMSCRIPTEN)
153153
#define HD_LITTLE_ENDIAN
154154
#else
155155
#error Unknown target OS for endianness defines
@@ -162,7 +162,7 @@ __aarch64__
162162
#if !defined(HD_COMPILER_MSVC) && !defined(HD_COMPILER_CLANG_CL) && !defined(HD_COMPILER_CLANG) && !defined(HD_COMPILER_GCC) && !defined(HD_COMPILER_EMSCRIPTEN)
163163
#error Compiler not supported
164164
#endif
165-
#if !defined(HD_OS_WINDOWS) && !defined(HD_OS_LINUX) && !defined(HD_OS_BROWSER)
165+
#if !defined(HD_OS_WINDOWS) && !defined(HD_OS_LINUX) && !defined(HD_OS_EMSCRIPTEN)
166166
#error Operating System targeted not supported
167167
#endif
168168
#if !defined(HD_DEBUG) && !defined(HD_DEBUGOPTIMIZED) && !defined(HD_RELEASE)

‎interface/core/string/cstring/cstring.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#if defined(HD_OS_WINDOWS)
55
#include "cstring_windows.h"
6-
#elif defined(HD_OS_LINUX) || defined(HD_OS_BROWSER)
6+
#elif defined(HD_OS_LINUX) || defined(HD_OS_EMSCRIPTEN)
77
#include "cstring_linux.h"
88
#else
99
#error Targeted OS not supported
@@ -16,7 +16,7 @@ namespace hud
1616
struct cstring :
1717
#if defined(HD_OS_WINDOWS)
1818
hud::windows::cstring
19-
#elif defined(HD_OS_LINUX) || defined(HD_OS_BROWSER)
19+
#elif defined(HD_OS_LINUX) || defined(HD_OS_EMSCRIPTEN)
2020
hud::linux::cstring
2121
#endif
2222
{

‎interface/core/string/cstring/cstring_linux.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define HD_INC_CORE_STRING_CSTRING_CSTRING_LINUX_H
33
#include "cstring_common.h"
44

5-
#if !defined(HD_OS_LINUX) && !defined(HD_OS_BROWSER)
5+
#if !defined(HD_OS_LINUX) && !defined(HD_OS_EMSCRIPTEN)
66
#error This file must be included only when targetting Linux OS
77
#endif
88

‎interface/core/types/types.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#if defined(HD_OS_WINDOWS)
66
#include "types_windows.h"
7-
#elif defined(HD_OS_LINUX) || defined(HD_OS_BROWSER)
7+
#elif defined(HD_OS_LINUX) || defined(HD_OS_EMSCRIPTEN)
88
#include "types_linux.h"
99
#else
1010
#error Targeted OS not supported
@@ -14,7 +14,7 @@ namespace hud
1414
{
1515
#if defined(HD_OS_WINDOWS)
1616
using types = hud::windows::types;
17-
#elif defined(HD_OS_LINUX) || defined(HD_OS_BROWSER)
17+
#elif defined(HD_OS_LINUX) || defined(HD_OS_EMSCRIPTEN)
1818
using types = hud::linux::types;
1919
#endif
2020

‎interface/core/types/types_linux.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define HD_INC_CORE_TYPES_TYPES_LINUX_H
33
#include "types_common.h"
44

5-
#if !defined(HD_OS_LINUX) && !defined(HD_OS_BROWSER)
5+
#if !defined(HD_OS_LINUX) && !defined(HD_OS_EMSCRIPTEN)
66
#error This file must be included only when targetting Linux OS
77
#endif
88

‎interface/core/uuid/uuid.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#if defined(HD_OS_WINDOWS)
55
#include "uuid_windows.h"
6-
#elif defined(HD_OS_LINUX) || defined(HD_OS_BROWSER)
6+
#elif defined(HD_OS_LINUX) || defined(HD_OS_EMSCRIPTEN)
77
#include "uuid_linux.h"
88
#else
99
#error Targeted OS not supported
@@ -15,7 +15,7 @@ namespace hud
1515
/** Provides UUID operations. */
1616
#if defined(HD_OS_WINDOWS)
1717
using uuid = hud::windows::uuid;
18-
#elif defined(HD_OS_LINUX) || defined(HD_OS_BROWSER)
18+
#elif defined(HD_OS_LINUX) || defined(HD_OS_EMSCRIPTEN)
1919
using uuid = hud::linux::uuid;
2020
#else
2121
#error Unsupported platform

‎interface/core/uuid/uuid_linux.h‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
#include "uuid_common.h"
44
#include <sys/random.h>
55

6-
#if defined(HD_OS_BROWSER)
6+
#if defined(HD_COMPILER_EMSCRIPTEN)
77
#include <emscripten.h>
88
#endif
99

10-
#if !defined(HD_OS_LINUX) && !defined(HD_OS_BROWSER)
10+
#if !defined(HD_OS_LINUX) && !defined(HD_OS_EMSCRIPTEN)
1111
#error This file must be included only when targetting Linux OS
1212
#endif
1313

@@ -42,11 +42,9 @@ namespace hud::linux
4242
return false;
4343
}
4444
// LCOV_EXCL_STOP
45-
#elif defined(HD_OS_BROWSER)
45+
#elif defined(HD_OS_EMSCRIPTEN)
4646
EM_ASM({
47-
if (typeof window.crypto === 'undefined') {
48-
const crypto = require('crypto');
49-
}
47+
const crypto = require('crypto');
5048
var bytes = new Uint8Array(16);
5149
crypto.getRandomValues(bytes);
5250
for (var i = 0; i < 16; i++) {

0 commit comments

Comments
 (0)