projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed some platform-related preprocessor definition names
[rocksndiamonds.git]
/
src
/
libgame
/
platform.h
diff --git
a/src/libgame/platform.h
b/src/libgame/platform.h
index d5b15580f7c2c9841a509a071d9503124c5cf77f..b9c8a411090f80b5a91a3776d3732d9f2dfe8082 100644
(file)
--- a/
src/libgame/platform.h
+++ b/
src/libgame/platform.h
@@
-4,7
+4,7
@@
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
-// http://www.artsoft.org/
+// http
s
://www.artsoft.org/
// ----------------------------------------------------------------------------
// platform.h
// ============================================================================
// ----------------------------------------------------------------------------
// platform.h
// ============================================================================
@@
-16,8
+16,8
@@
// define main platform keywords
// ============================================================================
// define main platform keywords
// ============================================================================
-#if defined(WIN32) || defined(_WIN32)
-#define PLATFORM_WIN
32
+#if defined(WIN32) || defined(_WIN32)
|| defined(_WIN64)
+#define PLATFORM_WIN
DOWS
#define PLATFORM_STRING "Windows"
#else
#define PLATFORM_UNIX
#define PLATFORM_STRING "Windows"
#else
#define PLATFORM_UNIX
@@
-38,7
+38,7
@@
#if defined(AMIGA) || defined(__AMIGA) || defined(__amigados__)
#define PLATFORM_AMIGA
#undef PLATFORM_STRING
#if defined(AMIGA) || defined(__AMIGA) || defined(__amigados__)
#define PLATFORM_AMIGA
#undef PLATFORM_STRING
-#define PLATFORM_STRING "Amiga
OS
"
+#define PLATFORM_STRING "Amiga"
#endif
#if defined(__BEOS__)
#endif
#if defined(__BEOS__)
@@
-86,9
+86,9
@@
#endif
#if defined(__APPLE__) && defined(__MACH__)
#endif
#if defined(__APPLE__) && defined(__MACH__)
-#define PLATFORM_MAC
OSX
+#define PLATFORM_MAC
#undef PLATFORM_STRING
#undef PLATFORM_STRING
-#define PLATFORM_STRING "Mac
OS X
"
+#define PLATFORM_STRING "Mac"
#endif
#if defined(__NetBSD__)
#endif
#if defined(__NetBSD__)
@@
-153,6
+153,12
@@
#define PLATFORM_STRING "Android"
#endif
#define PLATFORM_STRING "Android"
#endif
+#if defined(__EMSCRIPTEN__)
+#define PLATFORM_EMSCRIPTEN
+#undef PLATFORM_STRING
+#define PLATFORM_STRING "Emscripten"
+#endif
+
// ============================================================================
// define additional platform keywords for CPU architecture
// ============================================================================
// define additional platform keywords for CPU architecture