diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0aed9cd..01170d3 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,8 +55,22 @@ endif()
 
 if(${CMAKE_GENERATOR} MATCHES "Visual Studio")
 
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_X86_ /D_USE_MATH_DEFINES")
-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi /Oi /GL /Ot /Ox /D_X86_ /D_USE_MATH_DEFINES")
+   add_definitions(
+     -D_USE_MATH_DEFINES
+     -DUNICODE
+     -D_UNICODE
+     -DNOGDI
+#	 -D_X86_
+   )
+
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /permissive-")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:twoPhase-") # disable two-phase name lookup due to OpenMP
+  
+   
+  #SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ")
+  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi /Oi /GL /Ot /Ox")
   SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG")
   SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG /INCREMENTAL:NO")
 
@@ -105,8 +119,8 @@ ADD_EXECUTABLE(
 # needed external libraries
 TARGET_LINK_LIBRARIES(
 	${PROJECT_NAME}
-	gtest
-	pthread
+#	gtest
+#	pthread
 	${EXTRA_LIBS}
 )