[pypy-commit] pypy win64-stage1: added explicit _WIN32/_WIN64 defns for nmake

ctismer noreply at buildbot.pypy.org
Thu Nov 24 00:26:27 CET 2011


Author: Christian Tismer <tismer at stackless.com>
Branch: win64-stage1
Changeset: r49714:7749a906e83a
Date: 2011-11-24 00:25 +0100
http://bitbucket.org/pypy/pypy/changeset/7749a906e83a/

Log:	added explicit _WIN32/_WIN64 defns for nmake

diff --git a/pypy/translator/platform/windows.py b/pypy/translator/platform/windows.py
--- a/pypy/translator/platform/windows.py
+++ b/pypy/translator/platform/windows.py
@@ -91,8 +91,9 @@
     standalone_only = ()
     shared_only = ()
     environ = None
-
+    
     def __init__(self, cc=None, x64=False):
+        self.x64 = x64
         if x64:
             msvc_compiler_environ = msvc_compiler_environ64
         else:
@@ -302,7 +303,10 @@
             ('CC_LINK', self.link),
             ('LINKFILES', eci.link_files),
             ('MASM', self.masm),
+            ('_WIN32', '1'),
             ]
+        if self.x64:
+            definitions.append(('_WIN64', '1'))
 
         for args in definitions:
             m.definition(*args)


More information about the pypy-commit mailing list