From: Jose Fonseca <jfonseca@vmware.com>
Date: Tue, 24 Mar 2015 20:30:03 +0000 (+0000)
Subject: scons: Don't build osmesa.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=69db422218b;p=mesa.git

scons: Don't build osmesa.

There doesn't seem much interest on osmesa on Windows, particularly classic osmesa.

If there is indeed interest in osmesa on Windows, we should instead
integrate src/gallium/targets/osmesa into SCons.

Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/drivers/SConscript b/src/mesa/drivers/SConscript
index 17813da960d..db656780c0b 100644
--- a/src/mesa/drivers/SConscript
+++ b/src/mesa/drivers/SConscript
@@ -1,7 +1,5 @@
 Import('*')
 
-SConscript('osmesa/SConscript')
-
 if env['x11']:
     SConscript('x11/SConscript')
 
diff --git a/src/mesa/drivers/osmesa/SConscript b/src/mesa/drivers/osmesa/SConscript
deleted file mode 100644
index caa14d3ace9..00000000000
--- a/src/mesa/drivers/osmesa/SConscript
+++ /dev/null
@@ -1,39 +0,0 @@
-Import('*')
-
-env = env.Clone()
-
-env.Prepend(CPPPATH = [
-    '#src',
-    '#src/mapi',
-    '#src/mesa',
-    Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers
-])
-
-env.Prepend(LIBS = [
-    mesautil,
-    glapi,
-    mesa,
-    glsl,
-])
-
-sources = [
-    'osmesa.c',
-]
-
-if env['platform'] == 'windows':
-    env.AppendUnique(CPPDEFINES = [
-        '_GDI32_', # prevent wgl* being declared __declspec(dllimport)
-        'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers 
-    ])
-    if not env['gles']:
-        # prevent _glapi_* from being declared __declspec(dllimport)
-        env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])
-
-    sources += ['osmesa.def']
-    
-osmesa = env.SharedLibrary(
-    target ='osmesa',
-    source = sources,
-)
-
-env.Alias('osmesa', osmesa)
diff --git a/src/mesa/drivers/osmesa/osmesa.def b/src/mesa/drivers/osmesa/osmesa.def
deleted file mode 100644
index 06afab72b0a..00000000000
--- a/src/mesa/drivers/osmesa/osmesa.def
+++ /dev/null
@@ -1,15 +0,0 @@
-;DESCRIPTION 'Mesa OSMesa lib for Win32'
-VERSION 4.1
-
-EXPORTS
-	OSMesaColorClamp
-	OSMesaCreateContext
-	OSMesaCreateContextExt
-	OSMesaDestroyContext
-	OSMesaMakeCurrent
-	OSMesaGetCurrentContext
-	OSMesaPixelStore
-	OSMesaGetIntegerv
-	OSMesaGetDepthBuffer
-	OSMesaGetColorBuffer
-	OSMesaGetProcAddress