[pywin32-checkins] pywin32 setup.py,1.93,1.94

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

Update of /cvsroot/pywin32/pywin32
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32263

Modified Files:
	setup.py 
Log Message:
Merge win32api.GetPwrCapabilities from py3k branch

Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** setup.py	25 Jan 2009 03:08:09 -0000	1.93
--- setup.py	25 Jan 2009 23:49:17 -0000	1.94
***************
*** 263,266 ****
--- 263,267 ----
                    unicode_mode=None, # 'none'==default or specifically true/false.
                    implib_name=None,
+                   delay_load_libraries="",
                   ):
          assert dsp_file or sources, "Either dsp_file or sources must be specified"
***************
*** 269,272 ****
--- 270,275 ----
                          'win32/src'] + include_dirs
          libraries=libraries.split()
+         self.delay_load_libraries=delay_load_libraries.split()
+         libraries.extend(self.delay_load_libraries)
  
          if export_symbol_file:
***************
*** 397,400 ****
--- 400,408 ----
              self.extra_compile_args.append("/EHsc")
  
+             if self.delay_load_libraries:
+                 self.libraries.append("delayimp")
+                 for delay_lib in self.delay_load_libraries:
+                     self.extra_link_args.append("/delayload:%s.lib" % delay_lib)
+ 
              # If someone needs a specially named implib created, handle that
              if self.implib_name:
***************
*** 1358,1362 ****
          ("timer", "user32", None),
          ("win2kras", "rasapi32", None, 0x0500),
-         ("win32api", "user32 advapi32 shell32 version", None, 0x0500, 'win32/src/win32apimodule.cpp win32/src/win32api_display.cpp'),
          ("win32cred", "AdvAPI32 credui", True, 0x0501, 'win32/src/win32credmodule.cpp'),
          ("win32crypt", "Crypt32", None, 0x0500, 'win32/src/win32crypt.i'),
--- 1366,1369 ----
***************
*** 1417,1420 ****
--- 1424,1435 ----
  # The few that need slightly special treatment
  win32_extensions += [
+     WinExt_win32("win32api",
+            sources = """
+                 win32/src/win32apimodule.cpp win32/src/win32api_display.cpp
+                 """.split(),
+            libraries="user32 advapi32 shell32 version",
+            delay_load_libraries="powrprof",
+            windows_h_version=0x0500,
+         ),
      WinExt_win32("win32gui", 
             sources = """