diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-27 18:28:12 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-27 18:28:12 +0000 |
| commit | 416b81c402d6a490abfd61b87b452d54071291be (patch) | |
| tree | c867298a796da25fef14c7ba44b197713d23f69a /third_party | |
| parent | 885dc2c4995c28dcd4381d845cb39522782dac29 (diff) | |
| download | chromium_src-416b81c402d6a490abfd61b87b452d54071291be.zip chromium_src-416b81c402d6a490abfd61b87b452d54071291be.tar.gz chromium_src-416b81c402d6a490abfd61b87b452d54071291be.tar.bz2 | |
Fixed compilation errors for Windows multi-DLL build.
TEST=try
BUG=none
Review URL: http://codereview.chromium.org/2856063
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53813 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -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) |