Mesa (master): scons: Don't build osmesa.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Wed Mar 25 10:44:19 UTC 2015
Module: Mesa
Branch: master
Commit: 69db422218b0264b5b8eef45bd003a2544e9cbd6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=69db422218b0264b5b8eef45bd003a2544e9cbd6
Author: Jose Fonseca <jfonseca at vmware.com>
Date: Tue Mar 24 20:30:03 2015 +0000
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 at vmware.com>
---
src/mesa/drivers/SConscript | 2 --
src/mesa/drivers/osmesa/SConscript | 39 ------------------------------------
src/mesa/drivers/osmesa/osmesa.def | 15 --------------
3 files changed, 56 deletions(-)
diff --git a/src/mesa/drivers/SConscript b/src/mesa/drivers/SConscript
index 17813da..db65678 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 caa14d3..0000000
--- 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 06afab7..0000000
--- 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
More information about the mesa-commit
mailing list