From 4343faa10fd46744430e28126d33a7a3a0b3b6e1 Mon Sep 17 00:00:00 2001
From: ntoskrnl <ntoskrnl11@yahoo.com>
Date: Sun, 29 Jul 2012 20:33:01 +0300
Subject: [PATCH] Some modifications for WIN64. SConscript not ready for that
 yet.

---
 SConscript   | 4 +++-
 src/Config.h | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/SConscript b/SConscript
index e7fb88a85..e00c2f944 100644
--- a/SConscript
+++ b/SConscript
@@ -119,13 +119,15 @@ if(GetOption('lin'):
     env.Append(LIBS=['X11', 'rt'])
     env.Append(CPPDEFINES=["LIN"])
     if GetOption('_64bit'):
-        env.Append(CPPDEFINES=["_64BIT"])
         env.Append(LINKFAGS=['-m64'])
         env.Append(CCFLAGS=['-m64'])
     else:
         env.Append(LINKFLAGS=['-m32'])
         env.Append(CCFLAGS=['-m32'])
 
+if GetOption('_64bit'):
+    env.Append(CPPDEFINES=["_64BIT"])
+
 if(GetOption('beta')):
     env.Append(CPPDEFINES='BETA')
 
diff --git a/src/Config.h b/src/Config.h
index 8b05f458f..730b2ffea 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -45,15 +45,19 @@
 #endif
 
 #if defined(WIN)
+#if defined(_64BIT)
+#define IDENT_PLATFORM "WIN64"
+#else
 #define IDENT_PLATFORM "WIN32"
-#elif defined(MACOSX)
-#define IDENT_PLATFORM "MACOSX"
+#endif
 #elif defined(LIN)
 #if defined(_64BIT)
 #define IDENT_PLATFORM "LIN64"
 #else
 #define IDENT_PLATFORM "LIN32"
 #endif
+#elif defined(MACOSX)
+#define IDENT_PLATFORM "MACOSX"
 #else
 #define IDENT_PLATFORM "UNKNOWN"
 #endif