diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3393cc6..152fa75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,7 @@ if (UNIX AND APPLE)
     set(LIBS "${LIBS}" "-framework OpenGL")
 elseif (WIN32)
     message(STATUS "Windows build")
+    set(CMAKE_CXX_FLAGS "/W2")
 elseif (UNIX AND NOT APPLE)
     message(STATUS "Linux build")
     set(LIBS "${LIBS}" "-lpng")
@@ -33,14 +34,14 @@ elseif (UNIX AND NOT APPLE)
     set(LIBS "${LIBS}" "-lXtst")
 endif()
 
-set(CMAKE_C_FLAGS "-Wall -Wparentheses -Winline -Wbad-function-cast -Wdisabled-optimization")
-set(CMAKE_C_FLAGS_RELEASE "-O3")
+set(CMAKE_CXX_FLAGS "-Wall -Wparentheses -Winline -Wbad-function-cast -Wdisabled-optimization")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     message(STATUS "No MSVC compiler in use, adding compile flags -Wextra")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
 endif()
 
-# add_compile_definitions(NAPI_CPP_EXCEPTIONS)
+add_compile_definitions(NAPI_CPP_EXCEPTIONS)
 
 # cmake-js
 set(INCLUDES ${INCLUDES} ${CMAKE_JS_INC})