X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fosmesa%2FSConscript;h=d7e8fe84da6d3909481f4b3b56f3b5703a696d35;hp=728031446e50a6ee9e2b7077b49d637cace27990;hb=0f847b18bc91dced5725169e8c96bef6c077db90;hpb=9601815b4be886f4d92bf74916de98f3bdb7275c

diff --git a/src/mesa/drivers/osmesa/SConscript b/src/mesa/drivers/osmesa/SConscript
index 728031446e5..d7e8fe84da6 100644
--- a/src/mesa/drivers/osmesa/SConscript
+++ b/src/mesa/drivers/osmesa/SConscript
@@ -7,6 +7,8 @@ env.Prepend(CPPPATH = [
     '#src/mapi',
     '#src/mesa',
     Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers
+    Dir('../../../mapi/glapi'), # src/mapi/glapi build path
+    Dir('../../../mapi/glapi/gen'), # src/mapi/glapi build path
 ])
 
 env.Prepend(LIBS = [
@@ -14,6 +16,8 @@ env.Prepend(LIBS = [
     glapi,
     compiler,
     mesa,
+    spirv,
+    nir,
     glsl,
 ])
 
@@ -25,10 +29,8 @@ if env['platform'] == 'windows':
     env.AppendUnique(CPPDEFINES = [
         '_GDI32_', # prevent wgl* being declared __declspec(dllimport)
         'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
+        '_GLAPI_NO_EXPORTS', # prevent _glapi_* from being declared __declspec(dllimport)
     ])
-    if not env['gles']:
-        # prevent _glapi_* from being declared __declspec(dllimport)
-        env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])
 
     sources += ['osmesa.def']