TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-25 01:23:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1566 from JeffProgrammer/vs2015dxfix

Browse source 
Looks good.
This commit is contained in:
Areloch 2016-03-25 09:05:54 -05:00
commit 1db77b728f
2 changed files with 10 additions and 0 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()

7
Tools/CMake/torque3d.cmake
View file

@ -541,6 +541,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)