summaryrefslogtreecommitdiff
path: root/src/Config.h
diff options
context:
space:
mode:
authorntoskrnl <ntoskrnl11@yahoo.com>2012-07-29 15:55:26 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-08-02 14:20:14 (GMT)
commit87dfc47c9785f834e61eef4545c503071d1665fc (patch)
tree558c8c24c064a6f24cb5ee1fa0ab38e81e2aaadb /src/Config.h
parentcbefea85d717bd599fa0559f091b051e904d9e2f (diff)
downloadpowder-87dfc47c9785f834e61eef4545c503071d1665fc.zip
powder-87dfc47c9785f834e61eef4545c503071d1665fc.tar.gz
Separate operating system and architecture preprocessor definitions
Conflicts: SConscript
Diffstat (limited to 'src/Config.h')
-rw-r--r--src/Config.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Config.h b/src/Config.h
index ccca4b0..52e5ae8 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -48,11 +48,13 @@
#define IDENT_PLATFORM "WIN32"
#elif defined(MACOSX)
#define IDENT_PLATFORM "MACOSX"
-#elif defined(LIN32)
-#define IDENT_PLATFORM "LIN32"
-#elif defined(LIN64)
+#elif defined(LIN)
+#if defined(_64BIT)
#define IDENT_PLATFORM "LIN64"
#else
+#define IDENT_PLATFORM "LIN32"
+#endif
+#else
#define IDENT_PLATFORM "UNKNOWN"
#endif