TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-21 04:15:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'GarageGames/development' into ueberengine-dev-3.10

Browse source 
Conflicts:
	Engine/source/app/version.h
	Engine/source/terrain/terrData.cpp
This commit is contained in:
Duion 2016-12-13 17:28:36 +01:00
commit 186604eb76
974 changed files with 121718 additions and 233088 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Tools/CMake/modules/module_openvr.cmake Normal file
View file

@ -0,0 +1,32 @@
# module openvr
option(TORQUE_OPENVR "Enable openvr module" OFF)
mark_as_advanced(TORQUE_OPENVR)
if(TORQUE_OPENVR)
if(TORQUE_OPENVR_SDK_PATH STREQUAL "")
set(TORQUE_OPENVR_SDK_PATH "" CACHE PATH "openvr library path" FORCE)
endif()
else() # hide variable
set(TORQUE_OPENVR_SDK_PATH "" CACHE INTERNAL "" FORCE)
endif()
if(TORQUE_OPENVR)
# Source
addPathRec( "${srcDir}/platform/input/openvr" )
# Includes
addInclude( "${TORQUE_OPENVR_SDK_PATH}/headers" )
# Libs
if( WIN32 )
if( TORQUE_CPU_X64 )
link_directories( "${TORQUE_OPENVR_SDK_PATH}/lib/win64" )
else()
link_directories( "${TORQUE_OPENVR_SDK_PATH}/lib/win32" )
endif()
addLib( "openvr_api" )
endif()
addDef(TORQUE_OPENVR)
endif()

2
Tools/CMake/modules/module_testing.cmake
View file

@ -20,7 +20,7 @@
# IN THE SOFTWARE.
# -----------------------------------------------------------------------------
option(TORQUE_TESTING "Enable unit test module" ON)
option(TORQUE_TESTING "Enable unit test module" OFF)
mark_as_advanced(TORQUE_TESTING)
if(TORQUE_TESTING)