diff options
| -rw-r--r-- | third_party/mesa/MesaLib/include/GL/gl.h | 6 | ||||
| -rw-r--r-- | third_party/mesa/README.chromium | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/third_party/mesa/MesaLib/include/GL/gl.h b/third_party/mesa/MesaLib/include/GL/gl.h index 70c95a0..69ad78f 100644 --- a/third_party/mesa/MesaLib/include/GL/gl.h +++ b/third_party/mesa/MesaLib/include/GL/gl.h @@ -55,7 +55,11 @@ # if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ # define GLAPI __declspec(dllexport) # elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ -# define GLAPI __declspec(dllimport) +// We always retrieve the entry points dynamically via GetProcAddress or +// OSMesaGetProcAddress. This works around an issue where using the MSVC +// multi-threaded runtime library, which defines _DLL. +//# define GLAPI __declspec(dllimport) +# define GLAPI # else /* for use with static link lib build of Win32 edition only */ # define GLAPI extern # endif /* _STATIC_MESA support */ diff --git a/third_party/mesa/README.chromium b/third_party/mesa/README.chromium index 050ad03..c257cca 100644 --- a/third_party/mesa/README.chromium +++ b/third_party/mesa/README.chromium @@ -35,3 +35,6 @@ Later modifications: #if defined(__BEOS__) || defined(__QUICKDRAW__) #pragma export on #endif + +- Commented out this in gl.h: +# define GLAPI __declspec(dllimport) |