[pywin32-checkins] pywin32 setup.py,1.95,1.96

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

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

Modified Files:
	setup.py 
Log Message:
November 2008 and later versions of the DX SDK set a DXSDK_DIR var

Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** setup.py	27 Jan 2009 13:09:09 -0000	1.95
--- setup.py	28 Jan 2009 10:54:06 -0000	1.96
***************
*** 693,708 ****
          # directx sdk sucks - how to locate it automatically?
          # Must manually set DIRECTX_SDK_DIR for now.
!         dxsdk_dir = os.environ.get("DIRECTX_SDK_DIR")
!         if dxsdk_dir:
!             extra = os.path.join(dxsdk_dir, 'include')
!             assert os.path.isdir(extra), "%s doesn't exist!" % (extra,)
!             self.compiler.add_include_dir(extra)
!             if is_64bit:
!                 tail = 'x64'
!             else:
!                 tail = 'x86'
!             extra = os.path.join(dxsdk_dir, 'lib', tail)
!             assert os.path.isdir(extra), "%s doesn't exist!" % (extra,)
!             self.compiler.add_library_dir(extra)
  
          log.debug("After SDK processing, includes are %s", self.compiler.include_dirs)
--- 693,712 ----
          # directx sdk sucks - how to locate it automatically?
          # Must manually set DIRECTX_SDK_DIR for now.
!         # (but it appears November 2008 and later versions set DXSDK_DIR, so
!         # we allow both, allowing our "old" DIRECTX_SDK_DIR to override things
!         for dxsdk_dir_var in ("DIRECTX_SDK_DIR", "DXSDK_DIR"):
!             dxsdk_dir = os.environ.get(dxsdk_dir_var)
!             if dxsdk_dir:
!                 extra = os.path.join(dxsdk_dir, 'include')
!                 assert os.path.isdir(extra), "%s doesn't exist!" % (extra,)
!                 self.compiler.add_include_dir(extra)
!                 if is_64bit:
!                     tail = 'x64'
!                 else:
!                     tail = 'x86'
!                 extra = os.path.join(dxsdk_dir, 'lib', tail)
!                 assert os.path.isdir(extra), "%s doesn't exist!" % (extra,)
!                 self.compiler.add_library_dir(extra)
!                 break
  
          log.debug("After SDK processing, includes are %s", self.compiler.include_dirs)