[pywin32-checkins] pywin32 setup_win32all.py,1.6,1.7

[<mha...@us...>]

Update of /cvsroot/pywin32/pywin32
In directory sc8-pr-cvs1:/tmp/cvs-serv20632

Modified Files:
	setup_win32all.py 
Log Message:
Janez Jere reports that all the COM modules fail without the platform SDK.


Index: setup_win32all.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup_win32all.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** setup_win32all.py	3 Dec 2003 09:04:07 -0000	1.6
--- setup_win32all.py	3 Dec 2003 09:26:08 -0000	1.7
***************
*** 171,174 ****
--- 171,178 ----
              kw["dsp_file"] = "com/" + name + ".dsp"
          kw["libraries"] = kw.get("libraries", "") + " oleaut32 ole32"
+ 
+         # COM extensions require later windows headers.
+         if not kw.get("windows_h_version"):
+             kw["windows_h_version"] = 0x500
          WinExt.__init__(self, name, **kw)
      def get_pywin32_dir(self):
***************
*** 597,606 ****
          ("win2kras", "rasapi32", False, 0x0500),
          ("win32api", "user32 advapi32 shell32 version", False, 0x0500),
!         ("win32file", "oleaut32", False),
          ("win32event", "user32", False),
          ("win32clipboard", "gdi32 user32 shell32", False),
          ("win32evtlog", "advapi32 oleaut32", False),
          # win32gui handled below
!         ("win32help", "htmlhelp user32 advapi32", False),
          ("win32lz", "lz32", False),
          ("win32net", "netapi32", True),
--- 601,610 ----
          ("win2kras", "rasapi32", False, 0x0500),
          ("win32api", "user32 advapi32 shell32 version", False, 0x0500),
!         ("win32file", "oleaut32", False, 0x0500),
          ("win32event", "user32", False),
          ("win32clipboard", "gdi32 user32 shell32", False),
          ("win32evtlog", "advapi32 oleaut32", False),
          # win32gui handled below
!         ("win32help", "htmlhelp user32 advapi32", False, 0x0500),
          ("win32lz", "lz32", False),
          ("win32net", "netapi32", True),
***************
*** 611,615 ****
          ("win32ras", "rasapi32 user32", False),
          ("win32security", "advapi32 user32", True),
!         ("win32service", "advapi32 oleaut32", True),
          ("win32trace", "advapi32", False),
          ("win32wnet", "netapi32 mpr", False),
--- 615,619 ----
          ("win32ras", "rasapi32 user32", False),
          ("win32security", "advapi32 user32", True),
!         ("win32service", "advapi32 oleaut32", True, 0x0500),
          ("win32trace", "advapi32", False),
          ("win32wnet", "netapi32 mpr", False),
***************
*** 640,644 ****
                                   '-DWINNT', '-DPYSERVICE_BUILD_DLL'],
             libraries = "user32 ole32 advapi32 shell32",
!            dsp_file = r"win32\Pythonservice servicemanager.dsp")
  ]
  
--- 644,649 ----
                                   '-DWINNT', '-DPYSERVICE_BUILD_DLL'],
             libraries = "user32 ole32 advapi32 shell32",
!            dsp_file = r"win32\Pythonservice servicemanager.dsp",
!            windows_h_version = 0x500)
  ]
  
***************
*** 650,653 ****
--- 655,659 ----
                     extra_compile_args = ['-DBUILD_PYTHONCOM'],
                     pch_header = "stdafx.h",
+                    windows_h_version = 0x500,
                     )
  com_extensions = [pythoncom]
***************
*** 682,686 ****
      WinExt_pythonwin("win32ui", extra_compile_args = ['-DBUILD_PYW'],
                       pch_header="stdafx.h"),
!     WinExt_pythonwin("win32uiole", pch_header="stdafxole.h"),
      WinExt_pythonwin("dde", pch_header="stdafxdde.h"),
  ]
--- 688,693 ----
      WinExt_pythonwin("win32ui", extra_compile_args = ['-DBUILD_PYW'],
                       pch_header="stdafx.h"),
!     WinExt_pythonwin("win32uiole", pch_header="stdafxole.h",
!                      windows_h_version = 0x500),
      WinExt_pythonwin("dde", pch_header="stdafxdde.h"),
  ]