diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2013-12-13 00:45:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-19 21:23:42 +0100 |
| commit | 1487ec4da0919527de81814ab4ad38b9eb0af167 (patch) | |
| tree | ef68ff53e5c2dd986dfb702bd6616ce87ec6f8a0 /src/angle/src | |
| parent | 492d922207a318b721a63f7c2b46d5d5012df1cf (diff) | |
d3dcompiler_qt: Fix export warning on MSVC
MSVC warns about multiple symbols when using extern "C", but MinGW
requires it. #ifdef it for MinGW.
Change-Id: I8b16ab4ea129312787090e042115d8f709fdd814
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Diffstat (limited to 'src/angle/src')
| -rw-r--r-- | src/angle/src/d3dcompiler/main.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/angle/src/d3dcompiler/main.cpp b/src/angle/src/d3dcompiler/main.cpp index 96d71d5e0d..70a8f30fb0 100644 --- a/src/angle/src/d3dcompiler/main.cpp +++ b/src/angle/src/d3dcompiler/main.cpp @@ -188,9 +188,12 @@ static QString makePath(const QDir &parent, const QString &child) } // namespace D3DCompiler -extern "C" __declspec(dllexport) HRESULT WINAPI D3DCompile( +#ifdef __MINGW32__ +extern "C" +#endif +__declspec(dllexport) HRESULT WINAPI D3DCompile( const void *, SIZE_T, const char *, const D3D_SHADER_MACRO *, ID3DInclude *, - const char *t, const char *, UINT, UINT, ID3DBlob **, ID3DBlob **); + const char *, const char *, UINT, UINT, ID3DBlob **, ID3DBlob **); HRESULT WINAPI D3DCompile( const void *data, SIZE_T data_size, const char *filename, |