TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-06 14:00:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development-gg' into epoxy

Browse source
This commit is contained in:
Jeff Hutchinson 2016-04-17 23:59:42 -04:00
commit fddc00b39b
1321 changed files with 92005 additions and 42431 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Tools/CMake/CMakeLists.txt
View file

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

17
Tools/CMake/torque3d.cmake
View file

@ -64,7 +64,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()
@ -83,6 +82,10 @@ else()
option(TORQUE_DEDICATED "Torque dedicated" OFF)
endif()
if(WIN32)
option(TORQUE_D3D11 "Allow Direct3D 11 render" OFF)
endif()
###############################################################################
# options
###############################################################################
@ -391,8 +394,9 @@ if(WIN32)
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")
@ -541,6 +545,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)

33
Tools/projectGenerator/modules/d3d11.inc Normal file
View 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();
?>