diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-12-13 05:45:29 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-12-13 05:45:29 +0000 |
| commit | b1d6e01866e37f84138d3e040f00ba0ca612b8c2 (patch) | |
| tree | b1dee5fd9495b34cd4e7fc2a28d9f974581268c2 /Graphics/GraphicsEngineOpenGL | |
| parent | Updated version in appveyor script (diff) | |
| download | DiligentCore-b1d6e01866e37f84138d3e040f00ba0ca612b8c2.tar.gz DiligentCore-b1d6e01866e37f84138d3e040f00ba0ca612b8c2.zip | |
Fixed build under MinGW
Diffstat (limited to 'Graphics/GraphicsEngineOpenGL')
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/include/pch.h | 4 |
2 files changed, 4 insertions, 2 deletions
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> |