diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-12-13 16:52:57 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-12-13 16:52:57 +0000 |
| commit | 93bfc06b01a6a845facf8a68f66c69c4458a40bd (patch) | |
| tree | 1f98ccf73a2e46df7b3a5e29a5eb5211d7d7a68a | |
| parent | Updated bindings for ClearDepthStencil and ClearRenderTarget (diff) | |
| download | DiligentTools-93bfc06b01a6a845facf8a68f66c69c4458a40bd.tar.gz DiligentTools-93bfc06b01a6a845facf8a68f66c69c4458a40bd.zip | |
Fixed MinGW build issues
| -rw-r--r-- | External/libtiff-4.0.3/libtiff/tif_config.h | 6 | ||||
| -rw-r--r-- | External/libtiff-4.0.3/libtiff/tiffconf.h | 6 | ||||
| -rw-r--r-- | HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/External/libtiff-4.0.3/libtiff/tif_config.h b/External/libtiff-4.0.3/libtiff/tif_config.h index 57bc233..1186266 100644 --- a/External/libtiff-4.0.3/libtiff/tif_config.h +++ b/External/libtiff-4.0.3/libtiff/tif_config.h @@ -1,6 +1,10 @@ #if PLATFORM_WIN32 || PLATFORM_UNIVERSAL_WINDOWS -# include "tif_config.vc.h" +# ifdef _MSC_VER +# include "tif_config.vc.h" +# else // MinGW +# include "tif_config.linux.h" +# endif #elif PLATFORM_ANDROID diff --git a/External/libtiff-4.0.3/libtiff/tiffconf.h b/External/libtiff-4.0.3/libtiff/tiffconf.h index 2bab5e4..a8d5121 100644 --- a/External/libtiff-4.0.3/libtiff/tiffconf.h +++ b/External/libtiff-4.0.3/libtiff/tiffconf.h @@ -1,6 +1,10 @@ #if PLATFORM_WIN32 || PLATFORM_UNIVERSAL_WINDOWS -# include "tiffconf.vc.h" +# ifdef _MSC_VER +# include "tiffconf.vc.h" +# else // MinGW +# include "tiffconf.linux.h" +# endif #elif PLATFORM_ANDROID || PLATFORM_LINUX || PLATFORM_MACOS || PLATFORM_IOS diff --git a/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp b/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp index 550569f..ddd9771 100644 --- a/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp +++ b/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp @@ -63,7 +63,7 @@ void PrintHelp() // Main int main(int argc, char** argv) { -#if defined(_DEBUG) || defined(DEBUG) +#if defined(_MSC_VER) && (defined(_DEBUG) || defined(DEBUG)) _CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF ); #endif |