glapi: Update SConscript for Windows.

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

diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript
index 15c08255c395af0d4109bc05273477810c0e7cba..27ef5adc27f852f4ad0e5f7aa550f0835ca83b91 100644 (file)
--- 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