Mesa (master): targets/egl: Add SConscript for egl_gdi_swrast.

Chia-I Wu olv at kemper.freedesktop.org
Mon May 31 05:28:55 UTC 2010


Module: Mesa
Branch: master
Commit: ec0bab3a51026d129fb60b5e6b435c6430e79b5b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec0bab3a51026d129fb60b5e6b435c6430e79b5b

Author: Chia-I Wu <olv at lunarg.com>
Date:   Mon May 31 12:17:27 2010 +0800

targets/egl: Add SConscript for egl_gdi_swrast.

egl_gdi_swrast uses st/egl/gdi and winsys/sw/gdi to provide an EGL
driver for Windows.

---

 src/gallium/targets/SConscript               |    5 ++++
 src/gallium/targets/egl-swrast/SConscript    |   30 ++++++++++++++++++++++++++
 src/gallium/targets/egl-swrast/swrast_glue.c |    6 -----
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/gallium/targets/SConscript b/src/gallium/targets/SConscript
index 519dbff..bae839a 100644
--- a/src/gallium/targets/SConscript
+++ b/src/gallium/targets/SConscript
@@ -30,6 +30,11 @@ if 'xorg' in env['statetrackers']:
 			'xorg-vmwgfx/SConscript',
 		])
 
+if 'egl' in env['statetrackers']:
+	SConscript([
+		'egl-swrast/SConscript',
+	])
+
 # Ideally all non-target directories would produce convenience
 # libraries, and the actual shared libraries and other installables
 # would be finally assembled in the targets subtree:
diff --git a/src/gallium/targets/egl-swrast/SConscript b/src/gallium/targets/egl-swrast/SConscript
new file mode 100644
index 0000000..213e5b3
--- /dev/null
+++ b/src/gallium/targets/egl-swrast/SConscript
@@ -0,0 +1,30 @@
+#######################################################################
+# SConscript for egl-swrast target
+
+Import('*')
+
+if env['platform'] == 'windows':
+
+    env = env.Clone()
+
+    env.Append(LIBS = [
+        'gdi32',
+        'user32',
+        'kernel32',
+        'ws2_32',
+    ])
+
+    drivers = [softpipe]
+    if env['llvm']:
+        drivers += [llvmpipe]
+    drivers += [identity, trace, rbug]
+
+    env['no_import_lib'] = 1
+
+    egl_gdi_swrast = env.SharedLibrary(
+        target ='egl_gdi_swrast',
+	source = 'swrast_glue.c',
+        LIBS = st_egl_gdi + ws_gdi + drivers + gallium + egl + env['LIBS'],
+    )
+
+    env.InstallSharedLibrary(egl_gdi_swrast)
diff --git a/src/gallium/targets/egl-swrast/swrast_glue.c b/src/gallium/targets/egl-swrast/swrast_glue.c
index 9db8089..defd11c 100644
--- a/src/gallium/targets/egl-swrast/swrast_glue.c
+++ b/src/gallium/targets/egl-swrast/swrast_glue.c
@@ -1,14 +1,8 @@
 #include "state_tracker/drm_api.h"
 
-static struct drm_api swrast_drm_api =
-{
-   .name = "swrast",
-};
-
 struct drm_api *
 drm_api_create()
 {
-   (void) swrast_drm_api;
    return NULL;
 }
 




More information about the mesa-commit mailing list