TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

correction for folks supporting older codebases outside of this engine: don't try and include the older directx library unless youre also deliberately using the older directsound end of things, and for dx11, reference the #include <d3d11_1.h> lib instead of the <d3d11.h> one to pair with the reference used by SDL2

Browse source
This commit is contained in:
Azaezel 2018-11-23 00:30:23 -06:00
parent fe01f23efe
commit b05d68aacd
2 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gfx/D3D11/gfxD3D11Device.h
View file

@ -23,7 +23,7 @@
#ifndef _GFXD3D11DEVICE_H_ #ifndef _GFXD3D11DEVICE_H_
#define _GFXD3D11DEVICE_H_ #define _GFXD3D11DEVICE_H_
#include <d3d11.h> #include <d3d11_1.h>
#include "platform/tmm_off.h" #include "platform/tmm_off.h"
#include "platformWin32/platformWin32.h" #include "platformWin32/platformWin32.h"

18
Tools/CMake/torque3d.cmake
View file

@ -211,12 +211,13 @@ if(WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4018") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4018")
# warning C4244: 'initializing' : conversion from 'XXX' to 'XXX', possible loss of data # warning C4244: 'initializing' : conversion from 'XXX' to 'XXX', possible loss of data
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4244") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4244")
if(TORQUE_SFX_DirectX)
if( TORQUE_CPU_X64 ) if( TORQUE_CPU_X64 )
link_directories($ENV{DXSDK_DIR}/Lib/x64) link_directories($ENV{DXSDK_DIR}/Lib/x64)
else() else()
link_directories($ENV{DXSDK_DIR}/Lib/x86) link_directories($ENV{DXSDK_DIR}/Lib/x86)
endif() endif()
endif()
endif() endif()
# build types # build types
@ -810,11 +811,6 @@ if(UNIX AND NOT APPLE)
addInclude("/usr/include/freetype2") addInclude("/usr/include/freetype2")
endif() endif()
# external things
if(WIN32)
set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY INCLUDE_DIRECTORIES $ENV{DXSDK_DIR}/Include)
endif()
if(MSVC) if(MSVC)
# Match projectGenerator naming for executables # Match projectGenerator naming for executables
set(OUTPUT_CONFIG DEBUG MINSIZEREL RELWITHDEBINFO) set(OUTPUT_CONFIG DEBUG MINSIZEREL RELWITHDEBINFO)