blorp: Fix 16x multisample scaled blits

[mesa.git] / src / mesa / SConscript

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index c986326d2bfa1ecda1b33fffc0de51f5c52d9b37..434800e456029b677261809efd05e8af73dc2d6e 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -13,10 +13,10 @@ env = env.Clone()
 env.MSVC2013Compat()
 
 env.Append(CPPPATH = [
+    '../compiler/nir',  # for generated nir_opcodes.h, etc
     '#/src',
     '#/src/mapi',
     '#/src/glsl',
-    '#/src/glsl/nir',
     '#/src/mesa',
     '#/src/gallium/include',
     '#/src/gallium/auxiliary',
@@ -83,8 +83,7 @@ format_unpack = env.CodeGenerate(
 #
 # Assembly sources
 #
-if (env['gcc'] or env['clang']) and \
-   env['platform'] not in ('cygwin', 'darwin', 'windows', 'haiku'):
+if env['platform'] not in ('cygwin', 'darwin', 'windows', 'haiku'):
     if env['machine'] == 'x86':
         env.Append(CPPDEFINES = [
             'USE_X86_ASM',