Mesa (master): glapi: Update SConscript for Windows.

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


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

Author: Chia-I Wu <olv at lunarg.com>
Date:   Mon May 31 10:52:23 2010 +0800

glapi: Update SConscript for Windows.

Define macros to enable dllexport and thread support.  Adjust the output
path of mapi sources.

---

 src/mapi/glapi/SConscript |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript
index 15c0825..27ef5ad 100644
--- a/src/mapi/glapi/SConscript
+++ b/src/mapi/glapi/SConscript
@@ -1,5 +1,5 @@
 #######################################################################
-# SConscript for Mesa
+# SConscript for glapi
 
 
 Import('*')
@@ -12,6 +12,13 @@ if env['platform'] != 'winddk':
 		'MAPI_GLAPI_CURRENT',
 	])
 
+	if env['platform'] == 'windows':
+		env.Append(CPPDEFINES = [
+			'_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
+			'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
+			'WIN32_THREADS', # use Win32 thread API
+		])
+
 	env.Append(CPPPATH = [
 		'#/src/mapi',
 		'#/src/mesa',
@@ -25,11 +32,14 @@ if env['platform'] != 'winddk':
 		'glthread.c',
 	]
 	
-	glapi_sources += [
-		'../mapi/u_current.c',
-		'../mapi/u_execmem.c',
-		'../mapi/u_thread.c',
+	mapi_sources = [
+		'u_current.c',
+		'u_execmem.c',
+		'u_thread.c',
 	]
+	for s in mapi_sources:
+		o = env.Object(s[:-2], '../mapi/' + s)
+		glapi_sources.append(o)
 
 	#
 	# Assembly sources




More information about the mesa-commit mailing list