Mirrors/bimg
1
0
Fork 0
mirror of https://github.com/bkaradzic/bimg.git synced 2026-02-17 20:52:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:bkaradzic/bimg

Browse Source
This commit is contained in:
Branimir Karadžić
2017-04-15 18:18:52 -07:00
parent a605781012 165246afe6
commit 01b04ae372
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
3rdparty/nvtt/nvcore/nvcore.h vendored
View File

@@ -139,6 +139,8 @@
# define NV_CPU_ARM 1
#elif defined POSH_CPU_AARCH64
# define NV_CPU_AARCH64 1
#elif defined POSH_CPU_EMSCRIPTEN
# define NV_CPU_EMSCRIPTEN 1
#else
# error "Unsupported CPU"
#endif
@@ -163,6 +165,10 @@
# define NV_CPU_AARCH64 0
#endif // NV_CPU_AARCH64
#ifndef NV_CPU_EMSCRIPTEN
# define NV_CPU_EMSCRIPTEN 0
#endif // NV_CPU_EMSCRIPTEN
// Compiler:
#if defined POSH_COMPILER_CLANG

9
3rdparty/nvtt/nvcore/posh.h vendored
View File

@@ -296,7 +296,7 @@ LLVM:
** Determine target operating system
** ----------------------------------------------------------------------------
*/
#if defined linux || defined __linux__
#if defined linux || defined __linux__ || defined EMSCRIPTEN
# define POSH_OS_LINUX 1
# define POSH_OS_STRING "Linux"
#endif
@@ -536,6 +536,11 @@ LLVM:
# define POSH_CPU_STRING "PA-RISC"
#endif
#if defined EMSCRIPTEN
# define POSH_CPU_EMSCRIPTEN 1
# define POSH_CPU_STRING "EMSCRIPTEN"
#endif
#if !defined POSH_CPU_STRING
# error POSH cannot determine target CPU
# define POSH_CPU_STRING "Unknown" /* this is here for Doxygen's benefit */
@@ -673,7 +678,7 @@ LLVM:
** the MIPS series, so we have to be careful about those.
** ----------------------------------------------------------------------------
*/
#if defined POSH_CPU_X86 || defined POSH_CPU_AXP || defined POSH_CPU_STRONGARM || defined POSH_CPU_AARCH64 || defined POSH_OS_WIN32 || defined POSH_OS_WINCE || defined __MIPSEL__
#if defined POSH_CPU_X86 || defined POSH_CPU_AXP || defined POSH_CPU_STRONGARM || defined POSH_CPU_AARCH64 || defined POSH_OS_WIN32 || defined POSH_OS_WINCE || defined __MIPSEL__ || defined POSH_CPU_EMSCRIPTEN
# define POSH_ENDIAN_STRING "little"
# define POSH_LITTLE_ENDIAN 1
#else