lili/opennurbs
1
0
Fork 0
mirror of https://github.com/mcneel/opennurbs.git synced 2026-04-19 04:36:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sync changes from upstream repository

Browse Source
This commit is contained in:
Bozo the Builder
2024-06-17 02:22:39 -07:00
parent 6dce0c19e7
commit a14564cf09
27 changed files with 233 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
opennurbs_system_runtime.h
View File

@@ -43,7 +43,7 @@
#define ON_RUNTIME_WIN
#endif
#elif defined(__ANDROID__) || defined(__EMSCRIPTEN__) || defined(ANDROID)
#elif defined(__ANDROID__) || defined(ANDROID)
// __EMSCRIPTEN__ is for a web assembly compile which currently compiles with the
// same settings as an android build. We will need to add an ON_RUNTIME_WASM once
// the __EMSCRIPTEN__ compile stabilizes
@@ -56,10 +56,15 @@
#define ON_RUNTIME_LINUX
#endif
#elif defined(__EMSCRIPTEN__)
#if !defined(ON_RUNTIME_WASM)
#define ON_RUNTIME_WASM
#endif
#endif
/*
//
// END - ON_RUNTIME_APPLE / ON_RUNTIME_WIN / ON_RUNTIME_ANDROID defines
// END - ON_RUNTIME_APPLE / ON_RUNTIME_WIN / ON_RUNTIME_ANDROID / ON_RUNTIME_WASM defines
//
////////////////////////////////////////////////////////////
*/
@@ -146,7 +151,7 @@
#define ON_RUNTIME_LINUX
#endif
#if defined(ON_RUNTIME_LINUX)
#if defined(ON_RUNTIME_LINUX) || defined(ON_RUNTIME_WASM)
#if !defined(ON_SIZEOF_WCHAR_T)
#define ON_SIZEOF_WCHAR_T 4