diff --git a/CMakeSettings.json b/CMakeSettings.json
index a54a82d..b580408 100644
--- a/CMakeSettings.json
+++ b/CMakeSettings.json
@@ -10,7 +10,7 @@
       "buildCommandArgs": "",
       "ctestCommandArgs": "",
       "inheritEnvironments": [ "msvc_x86" ],
-      "variables": []
+      "cmakeToolchain": "windows-x86.cmake"
     },
     {
       "name": "x86-Release",
@@ -22,7 +22,31 @@
       "buildCommandArgs": "",
       "ctestCommandArgs": "",
       "inheritEnvironments": [ "msvc_x86" ],
-      "variables": []
+      "cmakeToolchain": "windows-x86.cmake"
+    },
+    {
+      "name": "x64-Debug",
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": "",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "cmakeToolchain": "windows-x64.cmake"
+    },
+    {
+      "name": "x64-Release",
+      "generator": "Ninja",
+      "configurationType": "RelWithDebInfo",
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": "",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "cmakeToolchain": "windows-x64.cmake"
     }
   ]
 }
\ No newline at end of file
diff --git a/windows-x64.cmake b/windows-x64.cmake
index ed6ccc3..20cb015 100644
--- a/windows-x64.cmake
+++ b/windows-x64.cmake
@@ -3,7 +3,10 @@
 
 # specify the target system properties
 set(CMAKE_SYSTEM_NAME Windows)
-set(CMAKE_GENERATOR_PLATFORM x64 CACHE INTERNAL "")
+
+if (CMAKE_GENERATOR MATCHES "Visual Studio*")
+	set(CMAKE_GENERATOR_PLATFORM x64 CACHE INTERNAL "")
+endif()
 
 # specify shared library suffix
 set(SHARED_LIBRARY_SUFFIX ${CMAKE_GENERATOR_PLATFORM})
diff --git a/windows-x86.cmake b/windows-x86.cmake
index d3d7c95..71fd977 100644
--- a/windows-x86.cmake
+++ b/windows-x86.cmake
@@ -3,7 +3,10 @@
 
 # specify the target system properties
 set(CMAKE_SYSTEM_NAME Windows)
-set(CMAKE_GENERATOR_PLATFORM Win32 CACHE INTERNAL "")
+
+if (CMAKE_GENERATOR MATCHES "Visual Studio*")
+	set(CMAKE_GENERATOR_PLATFORM Win32 CACHE INTERNAL "")
+endif()
 
 # specify shared library suffix
 set(SHARED_LIBRARY_SUFFIX "x86")