Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r1282:4690f6191fc5
Date: 2013-07-18 19:43 +0200
http://bitbucket.org/cffi/cffi/changeset/4690f6191fc5/
Log: Check in win64.obj, thanks Matti :-)
diff --git a/c/libffi_msvc/win64.obj b/c/libffi_msvc/win64.obj
new file mode 100644
index
0000000000000000000000000000000000000000..38d3cd166b0ecad62ea4d9aab86cc574de0c9fe7
GIT binary patch
[cut]
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -63,12 +63,13 @@
libraries[:] = []
_filenames = [filename.lower() for filename in os.listdir(COMPILE_LIBFFI)]
_filenames = [filename for filename in _filenames
- if filename.endswith('.c') or
- filename.endswith('.asm')]
- if sys.maxsize <= 2**32:
- _filenames.remove('win64.asm')
- else:
+ if filename.endswith('.c')]
+ if sys.maxsize > 2**32:
+ # 64-bit: unlist win32.c, and add instead win64.obj. If the obj
+ # happens to get outdated at some point in the future, you need to
+ # rebuild it manually from win64.asm.
_filenames.remove('win32.c')
+ extra_link_args.append(os.path.join(COMPILE_LIBFFI, 'win64.obj'))
sources.extend(os.path.join(COMPILE_LIBFFI, filename)
for filename in _filenames)
define_macros.append(('USE_C_LIBFFI_MSVC', '1'))
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
