gallium: Don't serialize GPU writes.

[mesa.git] / winddk.py

diff --git a/winddk.py b/winddk.py
index 845cf90a9a45b62cca713f20112571e8f8baca78..58de18385769a994f5f8f49260d249418814e565 100644 (file)
--- a/winddk.py
+++ b/winddk.py
@@ -64,24 +64,23 @@ def get_winddk_paths(env, version=None):
     if 'BASEDIR' in os.environ:
         WINDDKdir = os.environ['BASEDIR']
     else:
-        #WINDDKdir = "C:\\WINDDK\\3790.1830"
-        WINDDKdir = "C:/WINDDK/3790.1830"
+        WINDDKdir = "C:\\WINDDK\\3790.1830"
 
     exe_paths.append( os.path.join(WINDDKdir, 'bin') )
-    exe_paths.append( os.path.join(WINDDKdir, 'bin/x86') )
-    include_paths.append( os.path.join(WINDDKdir, 'inc/wxp') )
+    exe_paths.append( os.path.join(WINDDKdir, 'bin', 'x86') )
+    include_paths.append( os.path.join(WINDDKdir, 'inc', 'wxp') )
     lib_paths.append( os.path.join(WINDDKdir, 'lib') )
 
     target_os = 'wxp'
     target_cpu = 'i386'
     
     env['SDK_INC_PATH'] = os.path.join(WINDDKdir, 'inc', target_os) 
-    env['CRT_INC_PATH'] = os.path.join(WINDDKdir, 'inc/crt') 
-    env['DDK_INC_PATH'] = os.path.join(WINDDKdir, 'inc/ddk', target_os) 
-    env['WDM_INC_PATH'] = os.path.join(WINDDKdir, 'inc/ddk/wdm', target_os) 
+    env['CRT_INC_PATH'] = os.path.join(WINDDKdir, 'inc', 'crt') 
+    env['DDK_INC_PATH'] = os.path.join(WINDDKdir, 'inc', 'ddk', target_os) 
+    env['WDM_INC_PATH'] = os.path.join(WINDDKdir, 'inc', 'ddk', 'wdm', target_os) 
 
     env['SDK_LIB_PATH'] = os.path.join(WINDDKdir, 'lib', target_os, target_cpu) 
-    env['CRT_LIB_PATH'] = os.path.join(WINDDKdir, 'lib/crt', target_cpu) 
+    env['CRT_LIB_PATH'] = os.path.join(WINDDKdir, 'lib', 'crt', target_cpu) 
     env['DDK_LIB_PATH'] = os.path.join(WINDDKdir, 'lib', target_os, target_cpu)
     env['WDM_LIB_PATH'] = os.path.join(WINDDKdir, 'lib', target_os, target_cpu)
                                      
@@ -201,17 +200,6 @@ def generate(env):
     env['SHOBJPREFIX']    = '$OBJPREFIX'
     env['SHOBJSUFFIX']    = '$OBJSUFFIX'
 
-    try:
-        include_path, lib_path, exe_path = get_winddk_paths(env)
-
-        # since other tools can set these, we just make sure that the
-        # relevant stuff from MSVS is in there somewhere.
-        env.PrependENVPath('INCLUDE', include_path)
-        env.PrependENVPath('LIB', lib_path)
-        env.PrependENVPath('PATH', exe_path)
-    except (SCons.Util.RegError, SCons.Errors.InternalError):
-        pass
-
     env['CFILESUFFIX'] = '.c'
     env['CXXFILESUFFIX'] = '.cc'
 
@@ -227,53 +215,22 @@ def generate(env):
 
     SCons.Tool.mslink.generate(env)
 
-    # See also:
-    # - WINDDK's bin/makefile.new i386mk.inc for more info.
-    # - http://alter.org.ua/docs/nt_kernel/vc8_proj/
-    env.Append(CPPDEFINES = [
-        'WIN32', 
-        '_WINDOWS', 
-        ('i386', '1'), 
-        ('_X86_', '1'), 
-        'STD_CALL', 
-        ('CONDITION_HANDLING', '1'),
-        ('NT_INST', '0'), 
-        ('_NT1X_', '100'),
-        ('WINNT', '1'),
-        ('_WIN32_WINNT', '0x0500'), # minimum required OS version
-        ('WIN32_LEAN_AND_MEAN', '1'),
-        ('DEVL', '1'),
-        ('FPO', '1'),
-    ])
-    cflags = [
-        '/GF', # Enable String Pooling
-        '/GX-', # Disable C++ Exceptions
-        '/Zp8', # 8bytes struct member alignment
-        #'/GS-', # No Buffer Security Check
-        '/GR-', # Disable Run-Time Type Info
-        '/Gz', # __stdcall Calling convention
-    ]
-    env.Append(CFLAGS = cflags)
-    env.Append(CXXFLAGS = cflags)
-    
-    env.Append(LINKFLAGS = [
-        '/DEBUG',
-        '/NODEFAULTLIB',
-        '/SUBSYSTEM:NATIVE',
-        '/INCREMENTAL:NO',
-        #'/DRIVER', 
-    
-        #'-subsystem:native,4.00',
-        '-base:0x10000',
-        
-        '-entry:DrvEnableDriver',
-    ])
-    
     if not env.has_key('ENV'):
         env['ENV'] = {}
-    if not env['ENV'].has_key('SystemRoot'):    # required for dlls in the winsxs folders
-        env['ENV']['SystemRoot'] = SCons.Platform.win32.get_system_root()
+    
+    try:
+        include_path, lib_path, exe_path = get_winddk_paths(env)
+
+        # since other tools can set these, we just make sure that the
+        # relevant stuff from WINDDK is in there somewhere.
+        env.PrependENVPath('INCLUDE', include_path)
+        env.PrependENVPath('LIB', lib_path)
+        env.PrependENVPath('PATH', exe_path)
+    except (SCons.Util.RegError, SCons.Errors.InternalError):
+        pass
+
 
 def exists(env):
     return env.Detect('cl')
 
+# vim:set sw=4 et: