Update of /cvsroot/pywin32/pywin32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11967
Modified Files:
setup.py
Log Message:
Get pythonwin working in x64 - via "[ 1705634 ] VC8.0 build patch for
AMD64 branch" - thanks to Steve Yin for his excellent contribution
Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** setup.py 24 May 2007 06:01:04 -0000 1.58
--- setup.py 24 May 2007 12:50:50 -0000 1.59
***************
*** 583,588 ****
# Not sure how to make this completely generic, and there is no
# need at this stage.
! if is_32bit:
! self._build_scintilla()
# Copy cpp lib files needed to create Python COM extensions
clib_files = (['win32', 'pywintypes%s.lib'],
--- 583,587 ----
# Not sure how to make this completely generic, and there is no
# need at this stage.
! self._build_scintilla()
# Copy cpp lib files needed to create Python COM extensions
clib_files = (['win32', 'pywintypes%s.lib'],
***************
*** 766,769 ****
--- 765,771 ----
ext.extra_link_args.append("/PDB:%s\%s.pdb" %
(pch_dir, ext.name))
+ # enable unwind semantics - some stuff needs it and I can't see
+ # it hurting
+ ext.extra_compile_args.append("/EHsc")
self.swig_cpp = True
***************
*** 1329,1339 ****
]
! pythonwin_extensions = []
if is_32bit:
pythonwin_extensions += [
- WinExt_pythonwin("win32ui", extra_compile_args = ['-DBUILD_PYW'],
- pch_header="stdafx.h", base_address=dll_base_address),
- WinExt_pythonwin("win32uiole", pch_header="stdafxole.h",
- windows_h_version = 0x500),
WinExt_pythonwin("dde", pch_header="stdafxdde.h"),
]
--- 1331,1342 ----
]
! pythonwin_extensions = [
! WinExt_pythonwin("win32ui", extra_compile_args = ['-DBUILD_PYW'],
! pch_header="stdafx.h", base_address=dll_base_address),
! WinExt_pythonwin("win32uiole", pch_header="stdafxole.h",
! windows_h_version = 0x500),
! ]
if is_32bit:
pythonwin_extensions += [
WinExt_pythonwin("dde", pch_header="stdafxdde.h"),
]
***************
*** 1371,1379 ****
extra_link_args=["/SUBSYSTEM:CONSOLE"],
libraries = "user32 advapi32 ole32 shell32"),
- ]
- if is_32bit:
- W32_exe_files += [
WinExt_pythonwin("Pythonwin", extra_link_args=["/SUBSYSTEM:WINDOWS"]),
! ]
# Special definitions for SWIG.
--- 1374,1379 ----
extra_link_args=["/SUBSYSTEM:CONSOLE"],
libraries = "user32 advapi32 ole32 shell32"),
WinExt_pythonwin("Pythonwin", extra_link_args=["/SUBSYSTEM:WINDOWS"]),
! ]
# Special definitions for SWIG.
|
