mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-13 15:44:36 +00:00
Merge branch 'GarageGames/master' into ueberengine-dev
Conflicts: Engine/source/T3D/fps/guiCrossHairHud.cpp
This commit is contained in:
Duion
commit
81750f3deb
2827 changed files with 315755 additions and 121398 deletions
|
|
@ -20,6 +20,9 @@
|
|||
# IN THE SOFTWARE.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
# JTH: We require CMake 3.1.4 for MSVC14 compatibility check
|
||||
cmake_minimum_required(VERSION 3.1.4)
|
||||
|
||||
include(basics.cmake)
|
||||
|
||||
setupVersionNumbers()
|
||||
|
|
|
|||
|
|
@ -71,6 +71,9 @@ macro(addPath dir)
|
|||
${dir}/*.h
|
||||
#${dir}/*.asm
|
||||
)
|
||||
foreach(entry ${BLACKLIST})
|
||||
list(REMOVE_ITEM tmp_files ${dir}/${entry})
|
||||
endforeach()
|
||||
LIST(APPEND ${PROJECT_NAME}_files "${tmp_files}")
|
||||
LIST(APPEND ${PROJECT_NAME}_paths "${dir}")
|
||||
#message(STATUS "addPath ${PROJECT_NAME} : ${tmp_files}")
|
||||
|
|
|
|||
43
Tools/CMake/libraries/epoxy.cmake
Normal file
43
Tools/CMake/libraries/epoxy.cmake
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2016 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(epoxy)
|
||||
|
||||
addPath("${libDir}/epoxy/src")
|
||||
|
||||
# TODO EGL support if we ever use EGL instead of GLX
|
||||
if (WIN32)
|
||||
addPath("${libDir}/epoxy/src/wgl")
|
||||
addDef(BUILD_WGL)
|
||||
else()
|
||||
addPath("${libDir}/epoxy/src/glx")
|
||||
addDef(BUILD_GLX)
|
||||
endif()
|
||||
|
||||
addInclude("${libDir}/epoxy/include")
|
||||
addInclude("${libDir}/epoxy/src")
|
||||
|
||||
finishLibrary()
|
||||
# VS 2015 has a problem with sdl and epoxy together and requires optimizations to be disabled
|
||||
if (MSVC14)
|
||||
target_compile_options(epoxy PRIVATE "/Od")
|
||||
endif()
|
||||
50
Tools/CMake/libraries/libbullet.cmake
Normal file
50
Tools/CMake/libraries/libbullet.cmake
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2015 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(libbullet)
|
||||
|
||||
addPath( "${libDir}/bullet/src" )
|
||||
addPath( "${libDir}/bullet/src/BulletCollision" )
|
||||
addPath( "${libDir}/bullet/src/BulletCollision/BroadphaseCollision" )
|
||||
addPath( "${libDir}/bullet/src/BulletCollision/CollisionDispatch" )
|
||||
addPath( "${libDir}/bullet/src/BulletCollision/CollisionShapes" )
|
||||
addPath( "${libDir}/bullet/src/BulletCollision/Gimpact" )
|
||||
addPath( "${libDir}/bullet/src/BulletCollision/NarrowPhaseCollision" )
|
||||
addPath( "${libDir}/bullet/src/BulletDynamics" )
|
||||
addPath( "${libDir}/bullet/src/BulletDynamics/Character" )
|
||||
addPath( "${libDir}/bullet/src/BulletDynamics/ConstraintSolver" )
|
||||
addPath( "${libDir}/bullet/src/BulletDynamics/Dynamics" )
|
||||
addPath( "${libDir}/bullet/src/BulletDynamics/Vehicle" )
|
||||
addPath( "${libDir}/bullet/src/LinearMath" )
|
||||
|
||||
if( WIN32 )
|
||||
addDef( "WIN32" )
|
||||
|
||||
addPath( "${libDir}/bullet/src/BulletMultiThreaded" )
|
||||
addPath( "${libDir}/bullet/src/BulletMultiThreaded/MiniCLTask" )
|
||||
addPath( "${libDir}/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask" )
|
||||
addInclude( "${libDir}/bullet/src/BulletMultiThreaded/vectormath/scalar/cpp" )
|
||||
endif()
|
||||
|
||||
addInclude( "${libDir}/bullet/src" )
|
||||
|
||||
finishLibrary()
|
||||
29
Tools/CMake/libraries/nativeFileDialogs.cmake
Normal file
29
Tools/CMake/libraries/nativeFileDialogs.cmake
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# 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(nativeFileDialogs)
|
||||
|
||||
addPath("${libDir}/nativeFileDialogs" REC)
|
||||
|
||||
addInclude(${libDir}/nativeFileDialogs/include)
|
||||
|
||||
finishLibrary()
|
||||
37
Tools/CMake/modules/module_bullet.cmake
Normal file
37
Tools/CMake/modules/module_bullet.cmake
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2015 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
# Bullet module
|
||||
|
||||
option(TORQUE_PHYSICS_BULLET "Use Bullet physics" OFF)
|
||||
|
||||
if( NOT TORQUE_PHYSICS_BULLET )
|
||||
return()
|
||||
endif()
|
||||
|
||||
addDef( "TORQUE_PHYSICS_BULLET" )
|
||||
addDef( "TORQUE_PHYSICS_ENABLED" )
|
||||
|
||||
addPath( "${srcDir}/T3D/physics/bullet" )
|
||||
addInclude( "${libDir}/bullet/src" )
|
||||
|
||||
addLib( "libbullet" )
|
||||
|
|
@ -35,6 +35,8 @@ if(UNIX)
|
|||
# for asm files
|
||||
SET (CMAKE_ASM_NASM_OBJECT_FORMAT "elf")
|
||||
ENABLE_LANGUAGE (ASM_NASM)
|
||||
|
||||
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||
endif()
|
||||
|
||||
# TODO: fmod support
|
||||
|
|
@ -64,7 +66,6 @@ option(TORQUE_EXTENDED_MOVE "Extended move support" OFF)
|
|||
mark_as_advanced(TORQUE_EXTENDED_MOVE)
|
||||
if(WIN32)
|
||||
option(TORQUE_SDL "Use SDL for window and input" OFF)
|
||||
mark_as_advanced(TORQUE_SDL)
|
||||
else()
|
||||
set(TORQUE_SDL ON) # we need sdl to work on Linux/Mac
|
||||
endif()
|
||||
|
|
@ -82,6 +83,13 @@ else()
|
|||
set(TORQUE_OPENGL ON) # we need OpenGL to render on Linux/Mac
|
||||
endif()
|
||||
|
||||
if(WIN32)
|
||||
option(TORQUE_D3D11 "Allow Direct3D 11 render" OFF)
|
||||
endif()
|
||||
|
||||
option(TORQUE_EXPERIMENTAL_EC "Experimental Entity/Component systems" OFF)
|
||||
mark_as_advanced(TORQUE_EXPERIMENTAL_EC)
|
||||
|
||||
###############################################################################
|
||||
# options
|
||||
###############################################################################
|
||||
|
|
@ -169,8 +177,6 @@ addPathRec("${srcDir}/app")
|
|||
addPath("${srcDir}/sfx/media")
|
||||
addPath("${srcDir}/sfx/null")
|
||||
addPath("${srcDir}/sfx")
|
||||
addPath("${srcDir}/component")
|
||||
addPath("${srcDir}/component/interfaces")
|
||||
addPath("${srcDir}/console")
|
||||
addPath("${srcDir}/core")
|
||||
addPath("${srcDir}/core/stream")
|
||||
|
|
@ -191,9 +197,16 @@ addPath("${srcDir}/windowManager/test")
|
|||
addPath("${srcDir}/math")
|
||||
addPath("${srcDir}/math/util")
|
||||
addPath("${srcDir}/math/test")
|
||||
|
||||
addPath("${srcDir}/platform")
|
||||
addPath("${srcDir}/cinterface")
|
||||
if(NOT TORQUE_SDL)
|
||||
set(BLACKLIST "fileDialog.cpp" )
|
||||
endif()
|
||||
addPath("${srcDir}/platform/nativeDialogs")
|
||||
set(BLACKLIST "" )
|
||||
|
||||
addPath("${srcDir}/cinterface")
|
||||
|
||||
if( NOT TORQUE_DEDICATED )
|
||||
addPath("${srcDir}/platform/menus")
|
||||
endif()
|
||||
|
|
@ -243,7 +256,13 @@ addPath("${srcDir}/ts/arch")
|
|||
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 "" )
|
||||
|
||||
addPath("${srcDir}/T3D/examples")
|
||||
addPath("${srcDir}/T3D/fps")
|
||||
addPath("${srcDir}/T3D/fx")
|
||||
|
|
@ -253,7 +272,22 @@ 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()
|
||||
|
||||
addPath("${srcDir}/main/")
|
||||
addPath("${srcDir}/assets")
|
||||
addPath("${srcDir}/module")
|
||||
addPath("${srcDir}/T3D/assets")
|
||||
addPathRec("${srcDir}/persistence")
|
||||
addPathRec("${srcDir}/ts/collada")
|
||||
addPathRec("${srcDir}/ts/loader")
|
||||
addPathRec("${projectSrcDir}")
|
||||
|
|
@ -326,7 +360,11 @@ if(TORQUE_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()
|
||||
|
||||
if(TORQUE_HIFI)
|
||||
|
|
@ -357,6 +395,28 @@ if(TORQUE_SDL)
|
|||
else()
|
||||
set(ENV{LDFLAGS} "${CXX_FLAG32} ${TORQUE_ADDITIONAL_LINKER_FLAGS}")
|
||||
endif()
|
||||
|
||||
find_package(PkgConfig REQUIRED)
|
||||
pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
|
||||
|
||||
# Setup CMake to use GTK+, tell the compiler where to look for headers
|
||||
# and to the linker where to look for libraries
|
||||
include_directories(${GTK3_INCLUDE_DIRS})
|
||||
link_directories(${GTK3_LIBRARY_DIRS})
|
||||
|
||||
# Add other flags to the compiler
|
||||
add_definitions(${GTK3_CFLAGS_OTHER})
|
||||
|
||||
set(BLACKLIST "nfd_win.cpp" )
|
||||
addLib(nativeFileDialogs)
|
||||
|
||||
set(BLACKLIST "" )
|
||||
target_link_libraries(nativeFileDialogs ${GTK3_LIBRARIES})
|
||||
else()
|
||||
set(BLACKLIST "nfd_gtk.c" )
|
||||
addLib(nativeFileDialogs)
|
||||
set(BLACKLIST "" )
|
||||
addLib(comctl32)
|
||||
endif()
|
||||
|
||||
#override and hide SDL2 cache variables
|
||||
|
|
@ -369,6 +429,10 @@ 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})
|
||||
|
|
@ -380,14 +444,19 @@ endforeach()
|
|||
###############################################################################
|
||||
if(WIN32)
|
||||
addPath("${srcDir}/platformWin32")
|
||||
if(TORQUE_SDL)
|
||||
set(BLACKLIST "fileDialog.cpp" )
|
||||
endif()
|
||||
addPath("${srcDir}/platformWin32/nativeDialogs")
|
||||
set(BLACKLIST "" )
|
||||
addPath("${srcDir}/platformWin32/menus")
|
||||
addPath("${srcDir}/platformWin32/threads")
|
||||
addPath("${srcDir}/platformWin32/videoInfo")
|
||||
addPath("${srcDir}/platformWin32/minidump")
|
||||
addPath("${srcDir}/windowManager/win32")
|
||||
#addPath("${srcDir}/gfx/D3D8")
|
||||
addPath("${srcDir}/gfx/D3D")
|
||||
if(TORQUE_D3D11)
|
||||
addPath("${srcDir}/gfx/D3D11")
|
||||
endif()
|
||||
addPath("${srcDir}/gfx/D3D9")
|
||||
addPath("${srcDir}/gfx/D3D9/pc")
|
||||
addPath("${srcDir}/shaderGen/HLSL")
|
||||
|
|
@ -468,12 +537,9 @@ if( TORQUE_OPENGL )
|
|||
if( TORQUE_OPENGL AND NOT TORQUE_DEDICATED )
|
||||
addPath("${srcDir}/gfx/gl")
|
||||
addPath("${srcDir}/gfx/gl/tGL")
|
||||
addPath("${srcDir}/shaderGen/GLSL")
|
||||
addPath("${srcDir}/shaderGen/GLSL")
|
||||
addPath("${srcDir}/terrain/glsl")
|
||||
addPath("${srcDir}/forest/glsl")
|
||||
|
||||
# glew
|
||||
LIST(APPEND ${PROJECT_NAME}_files "${libDir}/glew/src/glew.c")
|
||||
endif()
|
||||
|
||||
if(WIN32 AND NOT TORQUE_SDL)
|
||||
|
|
@ -526,6 +592,9 @@ addLib(squish)
|
|||
addLib(collada)
|
||||
addLib(pcre)
|
||||
addLib(convexDecomp)
|
||||
if (TORQUE_OPENGL)
|
||||
addLib(epoxy)
|
||||
endif()
|
||||
|
||||
if(WIN32)
|
||||
# copy pasted from T3D build system, some might not be needed
|
||||
|
|
@ -536,6 +605,13 @@ 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(UNIX)
|
||||
|
|
@ -585,9 +661,6 @@ endif()
|
|||
|
||||
if(TORQUE_OPENGL)
|
||||
addDef(TORQUE_OPENGL)
|
||||
if(WIN32)
|
||||
addDef(GLEW_STATIC)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(TORQUE_SDL)
|
||||
|
|
@ -618,8 +691,12 @@ addInclude("${libDir}/libogg/include")
|
|||
addInclude("${libDir}/opcode")
|
||||
addInclude("${libDir}/collada/include")
|
||||
addInclude("${libDir}/collada/include/1.4")
|
||||
if(TORQUE_SDL)
|
||||
addInclude("${libDir}/nativeFileDialogs/include")
|
||||
endif()
|
||||
if(TORQUE_OPENGL)
|
||||
addInclude("${libDir}/glew/include")
|
||||
addInclude("${libDir}/epoxy/include")
|
||||
addInclude("${libDir}/epoxy/src")
|
||||
endif()
|
||||
|
||||
if(UNIX)
|
||||
|
|
@ -627,10 +704,6 @@ if(UNIX)
|
|||
addInclude("/usr/include/freetype2")
|
||||
endif()
|
||||
|
||||
if(TORQUE_OPENGL)
|
||||
addInclude("${libDir}/glew/include")
|
||||
endif()
|
||||
|
||||
# external things
|
||||
if(WIN32)
|
||||
set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY INCLUDE_DIRECTORIES $ENV{DXSDK_DIR}/Include)
|
||||
|
|
@ -658,7 +731,34 @@ endif()
|
|||
|
||||
if(TORQUE_TEMPLATE)
|
||||
message("Prepare Template(${TORQUE_TEMPLATE}) install...")
|
||||
INSTALL(DIRECTORY "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game" DESTINATION "${TORQUE_APP_DIR}")
|
||||
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})
|
||||
install( FILES ${ITEM} DESTINATION ${INSTALL_DIR} )
|
||||
endforeach()
|
||||
|
||||
if(WIN32)
|
||||
INSTALL(FILES "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/cleanShaders.bat" DESTINATION "${TORQUE_APP_DIR}")
|
||||
INSTALL(FILES "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/DeleteCachedDTSs.bat" DESTINATION "${TORQUE_APP_DIR}")
|
||||
|
|
|
|||
|
|
@ -46,6 +46,14 @@ addEngineSrcDir('physics');
|
|||
addEngineSrcDir('gui/3d');
|
||||
addEngineSrcDir('postFx' );
|
||||
|
||||
addEngineSrcDir('assets');
|
||||
addEngineSrcDir('module');
|
||||
addEngineSrcDir('persistence/rapidjson');
|
||||
addEngineSrcDir('persistence/taml');
|
||||
addEngineSrcDir('persistence/taml/binary');
|
||||
addEngineSrcDir('persistence/taml/json');
|
||||
addEngineSrcDir('persistence/taml/xml');
|
||||
|
||||
// 3D game
|
||||
addEngineSrcDir('T3D');
|
||||
addEngineSrcDir('T3D/examples');
|
||||
|
|
@ -57,6 +65,7 @@ addEngineSrcDir('T3D/decal');
|
|||
addEngineSrcDir('T3D/sfx');
|
||||
addEngineSrcDir('T3D/gameBase');
|
||||
addEngineSrcDir('T3D/turret');
|
||||
addEngineSrcDir('T3D/assets');
|
||||
|
||||
global $TORQUE_HIFI_NET;
|
||||
global $TORQUE_EXTENDED_MOVE;
|
||||
|
|
|
|||
33
Tools/projectGenerator/modules/d3d11.inc
Normal file
33
Tools/projectGenerator/modules/d3d11.inc
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
<?php
|
||||
//-----------------------------------------------------------------------------
|
||||
// Copyright (c) 2015 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.
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
beginModule('d3d11');
|
||||
|
||||
if ( T3D_Generator::$platform == "win32" && !isDefined("TORQUE_DEDICATED"))
|
||||
{
|
||||
addEngineSrcDir("gfx/D3D11");
|
||||
}
|
||||
|
||||
endModule();
|
||||
|
||||
?>
|
||||
Loading…
Add table
Add a link
Reference in a new issue