aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi/glapi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-01-22 17:28:46 +0000
committermarha <marha@users.sourceforge.net>2011-01-22 17:28:46 +0000
commitf544012f5c37fba02cae71b39a533f8296cdabb5 (patch)
tree362b7ac783787d77962014f5f8e4e7c116de3f3f /mesalib/src/mapi/glapi
parent58eb5cd6de079f1f3ddf1edc2d436a24eb858dc2 (diff)
parentb8ffa56f8bda74a402eae0c89aadfda7b7db507f (diff)
downloadvcxsrv-f544012f5c37fba02cae71b39a533f8296cdabb5.tar.gz
vcxsrv-f544012f5c37fba02cae71b39a533f8296cdabb5.tar.bz2
vcxsrv-f544012f5c37fba02cae71b39a533f8296cdabb5.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mapi/glapi')
-rw-r--r--mesalib/src/mapi/glapi/SConscript5
-rw-r--r--mesalib/src/mapi/glapi/glapi.h5
2 files changed, 5 insertions, 5 deletions
diff --git a/mesalib/src/mapi/glapi/SConscript b/mesalib/src/mapi/glapi/SConscript
index 28dd7df16..d2bc3bafc 100644
--- a/mesalib/src/mapi/glapi/SConscript
+++ b/mesalib/src/mapi/glapi/SConscript
@@ -17,6 +17,11 @@ if env['platform'] != 'winddk':
'_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
])
+ if env['gles']:
+ env.Append(CPPDEFINES = ['_GLAPI_DLL_EXPORTS'])
+ else:
+ # prevent _glapi_* from being declared __declspec(dllimport)
+ env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])
env.Append(CPPPATH = [
'#/src/mapi',
diff --git a/mesalib/src/mapi/glapi/glapi.h b/mesalib/src/mapi/glapi/glapi.h
index ff37fd4f5..a99317ad0 100644
--- a/mesalib/src/mapi/glapi/glapi.h
+++ b/mesalib/src/mapi/glapi/glapi.h
@@ -42,11 +42,6 @@
#ifndef _GLAPI_H
#define _GLAPI_H
-/* opengl.dll does not export _glapi_* */
-#if defined(_WIN32)
-#define _GLAPI_NO_EXPORTS
-#endif
-
#ifdef _GLAPI_NO_EXPORTS
# define _GLAPI_EXPORT
#else /* _GLAPI_NO_EXPORTS */