From a73c6540d9a7f6e26d8568ba2fc522cb865f0a6c Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Fri, 23 Apr 2010 16:06:26 +0800
Subject: mapi: Add mapi and share the code with glapi.

Specifically, move all or most of

      glapi/glapi.c         to mapi/u_current.c,
      glapi/glapi_execmem.c to mapi/u_execmem.c,
      glapi/glthread.[ch]   to mapi/u_thread.[ch]

and remove their dependencies on core Mesa headers.
---
 src/mapi/glapi/SConscript | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/mapi/glapi/SConscript')

diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript
index 1ace2e6b2c..15c08255c3 100644
--- a/src/mapi/glapi/SConscript
+++ b/src/mapi/glapi/SConscript
@@ -8,21 +8,29 @@ if env['platform'] != 'winddk':
 
 	env = env.Clone()
 	
+	env.Append(CPPDEFINES = [
+		'MAPI_GLAPI_CURRENT',
+	])
+
 	env.Append(CPPPATH = [
 		'#/src/mapi',
 		'#/src/mesa',
 	])
 	
 	glapi_sources = [
-		'glapi.c',
 		'glapi_dispatch.c',
 		'glapi_entrypoint.c',
-		'glapi_execmem.c',
 		'glapi_getproc.c',
 		'glapi_nop.c',
 		'glthread.c',
 	]
 	
+	glapi_sources += [
+		'../mapi/u_current.c',
+		'../mapi/u_execmem.c',
+		'../mapi/u_thread.c',
+	]
+
 	#
 	# Assembly sources
 	#
-- 
cgit v1.2.3