diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0cb8f1eb..10f063cd8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,11 +87,7 @@ if(WIN32)
     set(ENV{PATH} "$ENV{PATH};${PROJECT_SOURCE_DIR}/dependencies/include")
     set(ENV{LIB} ${PROJECT_SOURCE_DIR}/dependencies/lib)
     set(ENV{OPENALDIR} ${PROJECT_SOURCE_DIR}/dependencies)
-    if(MSVC)
-        add_definitions(/D_IRR_STATIC_LIB_)
-    elseif(MINGW)
-        add_definitions(-D_IRR_STATIC_LIB_)
-    endif()
+    add_definitions(-D_IRR_STATIC_LIB_)
 endif()
 
 
@@ -149,7 +145,7 @@ endif()
 
 if(UNIX OR MINGW)
 #    if(USE_CPP2011)
-        add_definitions("-std=gnu++0x")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
 #    endif()
 endif()
 
@@ -172,7 +168,7 @@ endif()
 
 # Set some compiler options
 if(UNIX OR MINGW)
-    add_definitions(-Wall)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 endif()
 
 if(WIN32)
@@ -200,7 +196,7 @@ endif()
 # TODO: remove this switch
 add_definitions(-DHAVE_OGGVORBIS)
 
-if(WIN32 AND NOT MINGW)
+if(WIN32)
     configure_file("${STK_SOURCE_DIR}/windows_installer/icon_rc.template" "${PROJECT_BINARY_DIR}/tmp/icon.rc")
 endif()
 
@@ -291,8 +287,7 @@ if(UNIX AND NOT APPLE)
         target_link_libraries(supertuxkart ${IRRLICHT_XF86VM_LIBRARY})
     endif()
     if(USE_ASAN)
-        add_definitions("-fsanitize=address")
-        add_definitions("-fno-omit-frame-pointer")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
         target_link_libraries(supertuxkart "-fsanitize=address")
     endif()
 endif()
@@ -318,11 +313,7 @@ if(USE_WIIUSE)
         find_library(BLUETOOTH_LIBRARY NAMES IOBluetooth PATHS /Developer/Library/Frameworks/IOBluetooth.framework)
         target_link_libraries(supertuxkart wiiuse ${BLUETOOTH_LIBRARY})
     elseif(WIN32)
-        if(MSVC)
-            add_definitions("/DWIIUSE_STATIC")
-        else()
-            add_definitions("-DWIIUSE_STATIC")
-        endif()
+        add_definitions(-DWIIUSE_STATIC)
         if(WIIUSE_BUILD)
             target_link_libraries(supertuxkart wiiuse)
         else()