gallium/pp: s/uint/enum tgsi_semantic/ to fix MSVC warning

[mesa.git] / src / gallium / targets / libgl-gdi / SConscript

diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript
index 6fa0851a1ab867441a3cc4c419e15b85a40debf7..94feca24ef30e30d97591f8e96c81f2d93433862 100644 (file)
--- a/src/gallium/targets/libgl-gdi/SConscript
+++ b/src/gallium/targets/libgl-gdi/SConscript
@@ -6,6 +6,7 @@ Import('*')
 env = env.Clone()
 
 env.Append(CPPPATH = [
+    '#src',
     '#src/gallium/state_trackers/wgl',
     '#src/gallium/winsys/sw',
 ])
@@ -15,7 +16,13 @@ env.Append(LIBS = [
     'user32',
     'kernel32',
     'ws2_32',
-    talloc,
+    'advapi32',
+])
+
+env.Prepend(LIBS = [
+    mesautil,
+    nir,
+    spirv
 ])
 
 sources = ['libgl_gdi.c']
@@ -28,19 +35,23 @@ if env['llvm']:
     env.Append(CPPDEFINES = 'HAVE_LLVMPIPE')
     drivers += [llvmpipe]
 
-if env['gcc']:
+    if env['swr']:
+        env.Append(CPPDEFINES = 'HAVE_SWR')
+        drivers += [swr]
+
+if env['gcc'] and env['machine'] != 'x86_64':
+    # DEF parser in certain versions of MinGW is busted, as does not behave as
+    # MSVC.  mingw-w64 works fine.
     sources += ['#src/gallium/state_trackers/wgl/opengl32.mingw.def']
 else:
     sources += ['#src/gallium/state_trackers/wgl/opengl32.def']
-    
-drivers += [trace, rbug]
 
 env['no_import_lib'] = 1
 
 opengl32 = env.SharedLibrary(
     target ='opengl32',
     source = sources,
-    LIBS = wgl + ws_gdi + glapi + mesa + drivers + gallium + glsl + env['LIBS'],
+    LIBS = wgl + ws_gdi + glapi + compiler + mesa + drivers + gallium + glsl + nir + env['LIBS'],
 )
 
 env.Alias('opengl32', opengl32)