1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

d3dcompiler_qt: Fix export warning on MSVC

Browse Source 
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>
This commit is contained in:
Andrew Knight 2013-12-13 00:45:20 +02:00 committed by The Qt Project
parent 492d922207
commit 1487ec4da0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/angle/src/d3dcompiler/main.cpp
View File

@ -188,9 +188,12 @@ static QString makePath(const QDir &parent, const QString &child)
} // namespace D3DCompiler } // 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 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( HRESULT WINAPI D3DCompile(
const void *data, SIZE_T data_size, const char *filename, const void *data, SIZE_T data_size, const char *filename,