mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-02-12 19:31:41 +00:00
Merge branch 'development' into issue_2115
This commit is contained in:
Bloodknight
GitHub
commit
20eefee3cd
511 changed files with 30496 additions and 151320 deletions
|
|
@ -1,32 +0,0 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
project(lmng)
|
||||
|
||||
|
||||
addDef(MNG_OPTIMIZE_OBJCLEANUP)
|
||||
|
||||
addInclude(${libDir}/lpng)
|
||||
addInclude(${libDir}/zlib)
|
||||
addInclude(${libDir}/ljpeg)
|
||||
|
||||
finishLibrary("${libDir}/${PROJECT_NAME}")
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
project(lungif)
|
||||
|
||||
addDef(_GBA_NO_FILEIO)
|
||||
|
||||
|
||||
finishLibrary("${libDir}/${PROJECT_NAME}")
|
||||
|
|
@ -143,9 +143,6 @@ if(WIN32)
|
|||
option(TORQUE_D3D11 "Allow Direct3D 11 render" ON)
|
||||
endif()
|
||||
|
||||
option(TORQUE_EXPERIMENTAL_EC "Experimental Entity/Component systems" OFF)
|
||||
mark_as_advanced(TORQUE_EXPERIMENTAL_EC)
|
||||
|
||||
option(TORQUE_DEDICATED "Torque dedicated" OFF)
|
||||
mark_as_advanced(TORQUE_DEDICATED)
|
||||
|
||||
|
|
@ -316,9 +313,6 @@ addPath("${srcDir}/physics")
|
|||
addPath("${srcDir}/gui/3d")
|
||||
addPath("${srcDir}/postFx")
|
||||
|
||||
if(NOT TORQUE_EXPERIMENTAL_EC)
|
||||
set(BLACKLIST "entity.cpp;entity.h" )
|
||||
endif()
|
||||
addPath("${srcDir}/T3D")
|
||||
set(BLACKLIST "" )
|
||||
|
||||
|
|
@ -331,21 +325,13 @@ addPath("${srcDir}/T3D/decal")
|
|||
addPath("${srcDir}/T3D/sfx")
|
||||
addPath("${srcDir}/T3D/gameBase")
|
||||
addPath("${srcDir}/T3D/turret")
|
||||
|
||||
if( TORQUE_EXPERIMENTAL_EC )
|
||||
addPath("${srcDir}/T3D/components/")
|
||||
addPath("${srcDir}/T3D/components/animation")
|
||||
addPath("${srcDir}/T3D/components/camera")
|
||||
addPath("${srcDir}/T3D/components/collision")
|
||||
addPath("${srcDir}/T3D/components/game")
|
||||
addPath("${srcDir}/T3D/components/physics")
|
||||
addPath("${srcDir}/T3D/components/render")
|
||||
endif()
|
||||
addPathRec("${srcDir}/T3D/components/")
|
||||
addPathRec("${srcDir}/T3D/systems")
|
||||
|
||||
addPath("${srcDir}/main/")
|
||||
addPath("${srcDir}/assets")
|
||||
addPath("${srcDir}/module")
|
||||
addPath("${srcDir}/T3D/assets")
|
||||
addPathRec("${srcDir}/T3D/assets")
|
||||
addPathRec("${srcDir}/persistence")
|
||||
addPathRec("${srcDir}/ts/collada")
|
||||
addPathRec("${srcDir}/ts/loader")
|
||||
|
|
@ -418,12 +404,10 @@ endif()
|
|||
# Include tools for non-tool builds (or define player if a tool build)
|
||||
if(TORQUE_TOOLS)
|
||||
addPath("${srcDir}/gui/worldEditor")
|
||||
addPath("${srcDir}/gui/worldEditor/tools")
|
||||
addPath("${srcDir}/environment/editors")
|
||||
addPath("${srcDir}/forest/editor")
|
||||
addPath("${srcDir}/gui/editor")
|
||||
if(NOT TORQUE_EXPERIMENTAL_EC)
|
||||
set(BLACKLIST "entityGroup.cpp;entityGroup.h;mountingGroup.cpp;mountingGroup.h;componentGroup.cpp;componentGroup.h" )
|
||||
endif()
|
||||
addPath("${srcDir}/gui/editor/inspector")
|
||||
set(BLACKLIST "" )
|
||||
endif()
|
||||
|
|
@ -501,10 +485,6 @@ if(TORQUE_DEDICATED)
|
|||
addDef(TORQUE_DEDICATED)
|
||||
endif()
|
||||
|
||||
if(TORQUE_EXPERIMENTAL_EC)
|
||||
addDef(TORQUE_EXPERIMENTAL_EC)
|
||||
endif()
|
||||
|
||||
#modules dir
|
||||
file(GLOB modules "modules/*.cmake")
|
||||
foreach(module ${modules})
|
||||
|
|
@ -636,9 +616,7 @@ endif()
|
|||
###############################################################################
|
||||
# Common Libraries
|
||||
###############################################################################
|
||||
addLib(lmng)
|
||||
addLib(lpng)
|
||||
addLib(lungif)
|
||||
addLib(ljpeg)
|
||||
addLib(zlib)
|
||||
addLib(tinyxml)
|
||||
|
|
@ -660,13 +638,6 @@ if(WIN32)
|
|||
if(TORQUE_OPENGL)
|
||||
addLib(OpenGL32.lib)
|
||||
endif()
|
||||
|
||||
# JTH: DXSDK is compiled with older runtime, and MSVC 2015+ is when __vsnprintf is undefined.
|
||||
# This is a workaround by linking with the older legacy library functions.
|
||||
# See this for more info: http://stackoverflow.com/a/34230122
|
||||
if (MSVC14)
|
||||
addLib(legacy_stdio_definitions.lib)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if (APPLE)
|
||||
|
|
@ -854,26 +825,6 @@ if(TORQUE_TEMPLATE)
|
|||
message("Prepare Template(${TORQUE_TEMPLATE}) install...")
|
||||
file(GLOB_RECURSE INSTALL_FILES_AND_DIRS "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/*")
|
||||
|
||||
IF( NOT TORQUE_EXPERIMENTAL_EC)
|
||||
list(REMOVE_ITEM INSTALL_FILES_AND_DIRS "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/art/art.module.taml")
|
||||
list(REMOVE_ITEM INSTALL_FILES_AND_DIRS "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/art/shapes/actors/Soldier/soldier.asset.taml")
|
||||
list(REMOVE_ITEM INSTALL_FILES_AND_DIRS "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/scripts/scripts.module.taml")
|
||||
|
||||
foreach(ITEM ${INSTALL_FILES_AND_DIRS})
|
||||
get_filename_component( dir ${ITEM} DIRECTORY )
|
||||
get_filename_component( fileName ${ITEM} NAME )
|
||||
if( ${dir} STREQUAL ${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/scripts/server/components
|
||||
OR ${dir} STREQUAL ${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/scripts/server/components/game
|
||||
OR ${dir} STREQUAL ${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/scripts/server/components/input
|
||||
OR ${dir} STREQUAL ${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/scripts/server/gameObjects
|
||||
OR ${dir} STREQUAL ${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/tools/componentEditor
|
||||
OR ${dir} STREQUAL ${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/tools/componentEditor/gui
|
||||
OR ${dir} STREQUAL ${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/tools/componentEditor/scripts )
|
||||
list(REMOVE_ITEM INSTALL_FILES_AND_DIRS ${dir}/${fileName})
|
||||
ENDIF()
|
||||
endforeach()
|
||||
ENDIF()
|
||||
|
||||
foreach(ITEM ${INSTALL_FILES_AND_DIRS})
|
||||
get_filename_component( dir ${ITEM} DIRECTORY )
|
||||
STRING(REGEX REPLACE "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/" "${TORQUE_APP_DIR}/" INSTALL_DIR ${dir})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue