|
@@ -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
|