From b1d6e01866e37f84138d3e040f00ba0ca612b8c2 Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Wed, 12 Dec 2018 21:45:29 -0800
Subject: Fixed build under MinGW

---
 Graphics/GraphicsEngineOpenGL/CMakeLists.txt        | 2 +-
 Graphics/GraphicsEngineOpenGL/include/pch.h         | 4 +++-
 Graphics/GraphicsEngineVulkan/CMakeLists.txt        | 2 +-
 Graphics/GraphicsTools/src/TextureUploaderD3D11.cpp | 2 +-
 Graphics/GraphicsTools/src/TextureUploaderD3D12.cpp | 2 +-
 Graphics/GraphicsTools/src/TextureUploaderGL.cpp    | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'Graphics')

diff --git a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt
index 913282a8..356b7240 100644
--- a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt
+++ b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt
@@ -138,7 +138,7 @@ add_library(GraphicsEngineOpenGL-static STATIC
 add_library(GraphicsEngineOpenGL-shared SHARED 
     readme.md
 )
-if(PLATFORM_WIN32)
+if(PLATFORM_WIN32 AND MSVC)
     target_sources(GraphicsEngineOpenGL-shared 
     PRIVATE	
         src/DLLMain.cpp
diff --git a/Graphics/GraphicsEngineOpenGL/include/pch.h b/Graphics/GraphicsEngineOpenGL/include/pch.h
index 3319c6d5..60c2ee92 100644
--- a/Graphics/GraphicsEngineOpenGL/include/pch.h
+++ b/Graphics/GraphicsEngineOpenGL/include/pch.h
@@ -42,7 +42,9 @@
 #   endif
 #   include "GL/glew.h"
     // Glew includes <windows.h>
-#   define NOMINMAX
+#   ifndef NOMINMAX
+#       define NOMINMAX
+#   endif
 #   include "GL/wglew.h"
 #   include <GL/GL.h>
 
diff --git a/Graphics/GraphicsEngineVulkan/CMakeLists.txt b/Graphics/GraphicsEngineVulkan/CMakeLists.txt
index d8878ae0..4e56087f 100644
--- a/Graphics/GraphicsEngineVulkan/CMakeLists.txt
+++ b/Graphics/GraphicsEngineVulkan/CMakeLists.txt
@@ -152,7 +152,7 @@ add_library(GraphicsEngineVk-shared SHARED
     readme.md
 )
 
-if(PLATFORM_WIN32)
+if(PLATFORM_WIN32 AND MSVC)
     target_sources(GraphicsEngineVk-shared PRIVATE
         src/DLLMain.cpp
         src/GraphicsEngineVk.def
diff --git a/Graphics/GraphicsTools/src/TextureUploaderD3D11.cpp b/Graphics/GraphicsTools/src/TextureUploaderD3D11.cpp
index 71fb778d..ec4251e2 100644
--- a/Graphics/GraphicsTools/src/TextureUploaderD3D11.cpp
+++ b/Graphics/GraphicsTools/src/TextureUploaderD3D11.cpp
@@ -35,7 +35,7 @@
 #include "DeviceContextD3D11.h"
 #include "TextureD3D11.h"
 #include "DXGITypeConversions.h"
-#include "Signal.h"
+#include "ThreadSignal.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsTools/src/TextureUploaderD3D12.cpp b/Graphics/GraphicsTools/src/TextureUploaderD3D12.cpp
index 8d811cab..d21a944c 100644
--- a/Graphics/GraphicsTools/src/TextureUploaderD3D12.cpp
+++ b/Graphics/GraphicsTools/src/TextureUploaderD3D12.cpp
@@ -34,7 +34,7 @@
 #include "RenderDeviceD3D12.h"
 #include "BufferD3D12.h"
 #include "TextureD3D12.h"
-#include "Signal.h"
+#include "ThreadSignal.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsTools/src/TextureUploaderGL.cpp b/Graphics/GraphicsTools/src/TextureUploaderGL.cpp
index c1d4ccf8..46d9db2e 100644
--- a/Graphics/GraphicsTools/src/TextureUploaderGL.cpp
+++ b/Graphics/GraphicsTools/src/TextureUploaderGL.cpp
@@ -27,7 +27,7 @@
 #include <unordered_map>
 #include <vector>
 #include "TextureUploaderGL.h"
-#include "Signal.h"
+#include "ThreadSignal.h"
 
 namespace Diligent
 {
-- 
cgit v1.2.3