diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-22 13:05:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-22 13:05:58 +0000 |
| commit | b8ffa56f8bda74a402eae0c89aadfda7b7db507f (patch) | |
| tree | 33fb63493b21297286af67eadb21586ca9c20f41 /mesalib/src/mapi/glapi | |
| parent | b0be6a88c8fecdf15176f642c0799bff99930e0d (diff) | |
| download | vcxsrv-b8ffa56f8bda74a402eae0c89aadfda7b7db507f.tar.gz vcxsrv-b8ffa56f8bda74a402eae0c89aadfda7b7db507f.tar.bz2 vcxsrv-b8ffa56f8bda74a402eae0c89aadfda7b7db507f.zip | |
mesalib git update 22/1/2011
Diffstat (limited to 'mesalib/src/mapi/glapi')
| -rw-r--r-- | mesalib/src/mapi/glapi/SConscript | 5 | ||||
| -rw-r--r-- | mesalib/src/mapi/glapi/glapi.h | 5 |
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 e53cfbf2c..1d4ac4674 100644 --- a/mesalib/src/mapi/glapi/glapi.h +++ b/mesalib/src/mapi/glapi/glapi.h @@ -45,11 +45,6 @@ #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 */
|