TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-20 03:45:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'VerveMergeWIP' of https://github.com/Areloch/Torque3D into development

Browse source
This commit is contained in:
Areloch 2019-05-06 01:49:58 -05:00
commit 00b958aff9
549 changed files with 68656 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Tools/CMake/modules/module_verve.cmake Normal file
View file

@ -0,0 +1,31 @@
# -----------------------------------------------------------------------------
# Copyright (c) 2014 GarageGames, LLC
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to
# deal in the Software without restriction, including without limitation the
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
# sell copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
# -----------------------------------------------------------------------------
option(TORQUE_VERVE_ENABLED "Enable Verve module" ON)
option(TORQUE_VERVE_TOOLS_ENABLED "Enable Verve's Tools" ON)
if(TORQUE_VERVE_ENABLED)
addPathRec( "${srcDir}/Verve" )
endif()
if(TORQUE_VERVE_ENABLED)
addDef(VT_EDITOR)
endif()

8
Tools/CMake/torque3d.cmake
View file

@ -349,6 +349,14 @@ addPathRec("${srcDir}/ts/assimp")
addPathRec("${srcDir}/ts/loader")
addPathRec("${projectSrcDir}")
# Load module-based files
if(EXISTS ${TORQUE_APP_DIR}/game/data)
message("Reading modules in ${TORQUE_APP_DIR}/game/data path...")
addInclude("${TORQUE_APP_DIR}/game/data")
addPathRec("${TORQUE_APP_DIR}/game/data")
endif()
###############################################################################
# modular paths
###############################################################################