From b1d6e01866e37f84138d3e040f00ba0ca612b8c2 Mon Sep 17 00:00:00 2001 From: Egor Yusov 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 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'Graphics/GraphicsEngineOpenGL') 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 -# define NOMINMAX +# ifndef NOMINMAX +# define NOMINMAX +# endif # include "GL/wglew.h" # include -- cgit v1.2.3