- removed DirectX setup from CMakeLists for Visual Studio

For VS 2015 this is no longer needed, the DX headers and libraries are part of the Windows SDK and do not need to be looked for explicitly.
This commit is contained in:
Christoph Oelckers 2016-09-04 10:27:41 +02:00
parent eff03d13f0
commit 954ac8ce5e

View file

@ -114,6 +114,7 @@ if( WIN32 )
set( FMOD_LIB_PATH_SUFFIXES PATH_SUFFIXES lib )
set( NASM_NAMES nasmw nasm )
if( NOT MSVC )
find_path( D3D_INCLUDE_DIR d3d9.h
PATHS ENV DXSDK_DIR
PATH_SUFFIXES Include )
@ -152,11 +153,20 @@ if( WIN32 )
message( FATAL_ERROR "Could not find DirectX 9 libraries" )
endif()
set( ZDOOM_LIBS
wsock32
winmm
set( DX_LIBS
"${DX_dxguid_LIBRARY}"
"${DX_dinput8_LIBRARY}"
)
else()
set( DX_LIBS
dxguid
dinput8
)
endif()
set( ZDOOM_LIBS ${DX_LIBS}
wsock32
winmm
ole32
user32
gdi32