diff --git a/Tools/CMake/basics.cmake b/Tools/CMake/basics.cmake
index aa829fafa..8a87fe1d2 100644
--- a/Tools/CMake/basics.cmake
+++ b/Tools/CMake/basics.cmake
@@ -2,9 +2,15 @@ project("Torque3DEngine")
 
 set(TORQUE_TEMPLATE "Full" CACHE STRING "the template to use")
 
-set(projectDir    "${CMAKE_SOURCE_DIR}/My Projects/${TORQUE_APP_NAME}")
-set(projectOutDir "${projectDir}/game")
-set(projectSrcDir "${projectDir}/source")
+if(NOT projectDir)
+    set(projectDir    "${CMAKE_SOURCE_DIR}/My Projects/${TORQUE_APP_NAME}")
+endif()
+if(NOT projectOutDir)
+    set(projectOutDir "${projectDir}/game")
+endif()
+if(NOT projectSrcDir)
+    set(projectSrcDir "${projectDir}/source")
+endif()
 set(libDir        "${CMAKE_SOURCE_DIR}/Engine/lib")
 set(srcDir        "${CMAKE_SOURCE_DIR}/Engine/source")
 set(cmakeDir      "${CMAKE_SOURCE_DIR}/Tools/CMake")
@@ -281,12 +287,12 @@ set(TORQUE_STATIC ON)
 #option(TORQUE_STATIC "enables or disable static" OFF)
 
 if(WIN32)
-    # default disabled warnings: 4018;4100;4121;4127;4130;4244;4245;4389;4511;4512;4800;
-	set(TORQUE_CXX_FLAGS "/MP /O2 /Ob2 /Oi /Ot /Oy /GT /Zi /W4 /nologo /GF /EHsc /GS- /Gy- /Qpar- /arch:SSE2 /fp:fast /fp:except- /GR /Zc:wchar_t-" CACHE TYPE STRING)
+    set(TORQUE_DISABLED_WARNINGS " ")
+    set(TORQUE_CXX_FLAGS "/MP /O2 /Ob2 /Oi /Ot /Oy /GT /Zi /W4 /nologo /GF /EHsc /GS- /Gy- /Qpar- /arch:SSE2 /fp:fast /fp:except- /GR /Zc:wchar_t- /wd4018 /wd4100 /wd4121 /wd4127 /wd4130 /wd4244 /wd4245 /wd4389 /wd4511 /wd4512 /wd4800 /wd4995 /D_CRT_SECURE_NO_WARNINGS " CACHE TYPE STRING)
 	mark_as_advanced(TORQUE_CXX_FLAGS)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORQUE_CXX_FLAGS}")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS}")
-    #set(CMAKE_EXE_LINKER_FLAGS "/OPT:NOREF")
+    set(CMAKE_EXE_LINKER_FLAGS "/LARGEADDRESSAWARE")
     #set(STATIC_LIBRARY_FLAGS "/OPT:NOREF")
     
     # Force static runtime libraries
diff --git a/Tools/CMake/torque3d.cmake b/Tools/CMake/torque3d.cmake
index 1e9fb9bf6..0f8b99435 100644
--- a/Tools/CMake/torque3d.cmake
+++ b/Tools/CMake/torque3d.cmake
@@ -84,14 +84,14 @@ mark_as_advanced(TORQUE_DEBUG_GFX_MODE)
 #option(DEBUG_SPEW "more debug" OFF)
 set(TORQUE_NO_DSO_GENERATION ON)
 
-if(WIN32)
-    # warning C4800: 'XXX' : forcing value to bool 'true' or 'false' (performance warning)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4800")
-    # warning C4018: '<' : signed/unsigned mismatch
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4018")
-    # warning C4244: 'initializing' : conversion from 'XXX' to 'XXX', possible loss of data
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4244")
+# warning C4800: 'XXX' : forcing value to bool 'true' or 'false' (performance warning)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4800")
+# warning C4018: '<' : signed/unsigned mismatch
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4018")
+# warning C4244: 'initializing' : conversion from 'XXX' to 'XXX', possible loss of data
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4244")
 
+if(WIN32)
     link_directories($ENV{DXSDK_DIR}/Lib/x86)
 endif()