From 61d126020d63ec2d8ee91d1442f96f8fcf140ec1 Mon Sep 17 00:00:00 2001 From: Slyshyk Oleksiy Date: Tue, 29 Aug 2017 00:34:17 +0300 Subject: [PATCH] Fix compilation on win32 (#97) * fix build flags for WIN32 * make mingw happy with template params * correct few remarks * declare StreamHandle constructor only for MSVC * Return to old declaration of StreamHandle constructor --- CMakeLists.txt | 6 +++--- src/uvw/stream.hpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 30326075..9927436f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,11 +32,11 @@ message("*") set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) -if(NOT WIN32) +if(NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -DDEBUG") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os -DRELEASE") endif() -set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -DDEBUG") -set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os -DRELEASE") # # CMake configuration diff --git a/src/uvw/stream.hpp b/src/uvw/stream.hpp index 8cc504e9..243a677a 100644 --- a/src/uvw/stream.hpp +++ b/src/uvw/stream.hpp @@ -154,7 +154,7 @@ class StreamHandle: public Handle { } public: -#ifdef _WIN32 +#ifdef _MSC_VER StreamHandle(ConstructorAccess ca, std::shared_ptr ref) : Handle{ca, std::move(ref)} {}