This commit is contained in:
Christoph Oelckers 2013-12-09 11:34:41 +01:00
commit d2927c3d8c

View file

@ -105,9 +105,6 @@ if( WIN32 )
include_directories( ${XINPUT_INCLUDE_DIR} ) include_directories( ${XINPUT_INCLUDE_DIR} )
endif( NOT XINPUT_INCLUDE_DIR ) endif( NOT XINPUT_INCLUDE_DIR )
find_library( DX_ddraw_LIBRARY ddraw
PATHS ENV DXSDK_DIR
PATH_SUFFIXES Lib Lib/${XBITS} )
find_library( DX_dxguid_LIBRARY dxguid find_library( DX_dxguid_LIBRARY dxguid
PATHS ENV DXSDK_DIR PATHS ENV DXSDK_DIR
PATH_SUFFIXES Lib Lib/${XBITS} ) PATH_SUFFIXES Lib Lib/${XBITS} )
@ -116,9 +113,6 @@ if( WIN32 )
PATH_SUFFIXES Lib Lib/${XBITS} ) PATH_SUFFIXES Lib Lib/${XBITS} )
set( DX_LIBS_FOUND YES ) set( DX_LIBS_FOUND YES )
if( NOT DX_ddraw_LIBRARY )
set( DX_LIBS_FOUND NO )
endif( NOT DX_ddraw_LIBRARY )
if( NOT DX_dxguid_LIBRARY ) if( NOT DX_dxguid_LIBRARY )
set( DX_LIBS_FOUND NO ) set( DX_LIBS_FOUND NO )
endif( NOT DX_dxguid_LIBRARY ) endif( NOT DX_dxguid_LIBRARY )
@ -133,7 +127,6 @@ if( WIN32 )
set( ZDOOM_LIBS set( ZDOOM_LIBS
wsock32 wsock32
winmm winmm
"${DX_ddraw_LIBRARY}"
"${DX_dxguid_LIBRARY}" "${DX_dxguid_LIBRARY}"
"${DX_dinput8_LIBRARY}" "${DX_dinput8_LIBRARY}"
ole32 ole32