diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef3bc1cb..84aabed9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,6 +54,8 @@ if (MSVC)
 	set(CMAKE_EXE_LINKER_FLAGS "/STACK:${STACKSIZE}")
 	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")
 	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
 endif (MSVC)
 
 add_subdirectory(bspinfo)
diff --git a/light/CMakeLists.txt b/light/CMakeLists.txt
index 224b0230..312023a7 100644
--- a/light/CMakeLists.txt
+++ b/light/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required (VERSION 2.6)
-project (light)
+project (light CXX)
 
 set(LIGHT_INCLUDES
 	${CMAKE_SOURCE_DIR}/include/light/entities.h