diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7aad761a..e0186081 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,7 +77,7 @@ else (BUILD_DROGON_SHARED)
     add_library(${PROJECT_NAME} STATIC)
 endif (BUILD_DROGON_SHARED)
 
-if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
+if (NOT ${CMAKE_PLATFORM_NAME} STREQUAL "Windows" AND CMAKE_CXX_COMPILER_ID MATCHES GNU)
     target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
 endif ()
 
diff --git a/trantor b/trantor
index a70a0ab4..15556700 160000
--- a/trantor
+++ b/trantor
@@ -1 +1 @@
-Subproject commit a70a0ab4118100e809c828330e7c07e9b5b4466f
+Subproject commit 15556700e5ce305c7d3fd5a970a58ef6b8297e0c