diff --git a/Makefile b/Makefile
index 945bbfcea..ca62922e0 100644
--- a/Makefile
+++ b/Makefile
@@ -105,7 +105,7 @@ mk_run_tests_cpu: mk_build_swiftshader_library mk_build_tests mk_run_tests_cpu_o
 VS_BUILD_TYPE ?= "Debug"
 # Run with multiprocessin / parallel build by default
 VS_CMAKE_EXTRA_FLAGS ?= ""
-VS_KOMPUTE_EXTRA_CXX_FLAGS ?= "/MT" # /MP is for faster multiprocessing builds. You should add "/MT" for submodule builds for compatibility with gtest
+VS_KOMPUTE_EXTRA_CXX_FLAGS ?= ""
 VS_INSTALL_PATH ?= "build/src/CMakeFiles/Export/" # Set to "" if prefer default
 
 vs_cmake:
@@ -113,7 +113,7 @@ vs_cmake:
 		-Bbuild \
 		$(VS_CMAKE_EXTRA_FLAGS) \
 		-DCMAKE_TOOLCHAIN_FILE=$(VCPKG_WIN_PATH) \
-		-DKOMPUTE_EXTRA_CXX_FLAGS=$(VS_KOMPUTE_EXTRA_CXX_FLAGS) \
+		-DCMAKE_CXX_FLAGS=$(VS_KOMPUTE_EXTRA_CXX_FLAGS) \
 		-DCMAKE_INSTALL_PREFIX=$(VS_INSTALL_PATH) \
 		-DKOMPUTE_OPT_INSTALL=ON \
 		-DKOMPUTE_OPT_BUILD_TESTS=ON \
diff --git a/examples/android/android-simple/app/build.gradle b/examples/android/android-simple/app/build.gradle
index a115ef77d..cd8b9a42b 100644
--- a/examples/android/android-simple/app/build.gradle
+++ b/examples/android/android-simple/app/build.gradle
@@ -17,11 +17,11 @@ android {
                 abiFilters "armeabi-v7a", 'arm64-v8a', 'x86', 'x86_64'
                 arguments '-DANDROID_TOOLCHAIN=clang',
                         '-DANDROID_STL=c++_static',
-                        '-DKOMPUTE_OPT_ANDROID_BUILD=1',
-                        '-DKOMPUTE_OPT_INSTALL=0',
-                        '-DKOMPUTE_OPT_ENABLE_SPDLOG=0',
-                        '-DKOMPUTE_OPT_DISABLE_VK_DEBUG_LAYERS=1',
-                        '-DKOMPUTE_EXTRA_CXX_FLAGS=-DKOMPUTE_VK_API_MINOR_VERSION=0'
+                        '-DKOMPUTE_OPT_ANDROID_BUILD=ON',
+                        '-DKOMPUTE_OPT_INSTALL=OFF',
+                        '-DKOMPUTE_OPT_USE_SPDLOG=OFF',
+                        '-DKOMPUTE_OPT_DISABLE_VK_DEBUG_LAYERS=ON',
+                        '-DCMAKE_CXX_FLAGS=-DKOMPUTE_VK_API_MINOR_VERSION=0'
             }
         }
     }