diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8c40b973..77ee23cc8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,9 +3,14 @@ cmake_minimum_required (VERSION 2.6)
 project (MCServer)
 
 set(CMAKE_CXX_FLAGS_BAK ${CMAKE_CXX_FLAGS})
-set(CMAKE_CXX_FLAGS    "${CMAKE_CXX_FLAGS} -w")
 set(CMAKE_C_FLAGS_BAK   ${CMAKE_C_FLAGS})
-set(CMAKE_C_FLAGS      "${CMAKE_C_FLAGS} -w")
+if (UNIX)
+	set(CMAKE_CXX_FLAGS    "${CMAKE_CXX_FLAGS} -w")
+	set(CMAKE_C_FLAGS      "${CMAKE_C_FLAGS} -w")
+else()
+	set(CMAKE_CXX_FLAGS    "${CMAKE_CXX_FLAGS} /w")
+	set(CMAKE_C_FLAGS      "${CMAKE_C_FLAGS} /w")
+endif()
 set(CMAKE_BUILD_TYPE_BAK ${CMAKE_BUILD_TYPE})
 set(CMAKE_BUILD_TYPE "Release")
 
@@ -21,8 +26,13 @@ add_subdirectory(lib/luaexpat/)
 add_subdirectory(lib/md5/)
 
 #TODo: set -Wall -Werror -Wextra
-set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS_BAK}")
-set(CMAKE_C_FLAGS    "${CMAKE_C_FLAGS_BAK}")
+if(UNIX)
+	set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS_BAK} -Wall -Wextra")
+	set(CMAKE_C_FLAGS    "${CMAKE_C_FLAGS_BAK} -Wall -Wextra")
+else()
+	set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS_BAK} /Wall")
+	set(CMAKE_C_FLAGS    "${CMAKE_C_FLAGS_BAK} /Wall")
+endif()
 set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE_BAK}")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic")