From d7f9c8d7b6915f0f1ebb25996e6fbf56fbea37bf Mon Sep 17 00:00:00 2001 From: Tracy Ward Date: Fri, 4 Oct 2019 11:34:24 -0400 Subject: [PATCH] Remove more DX CMake bits There is also a weird bit in here that seems like it should be whether to use system or included libpng, but it actually does the directx include dir on one side. --- src/CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f68a758ae3..da33e8f4b3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -481,9 +481,6 @@ if(WIN32) "setupapi.lib" "hid.lib") - get_filename_component(DIRECTX_LIBRARY_DIR "${DIRECTX_LIBRARIES}" DIRECTORY) - - sm_add_link_flag("${SM_EXE_NAME}" "/LIBPATH:\"${DIRECTX_LIBRARY_DIR}\"") sm_add_link_flag("${SM_EXE_NAME}" "/LIBPATH:\"${SM_EXTERN_DIR}/ffmpeg/lib\"") sm_add_link_flag("${SM_EXE_NAME}" "/LIBPATH:\"${SM_SRC_DIR}/archutils/Win32/ddk\"") @@ -665,7 +662,8 @@ else() endif() if(WIN32) - list(APPEND SM_INCLUDE_DIRS ${DIRECTX_INCLUDE_DIR}) + # FIXME: This makes no sense... + #list(APPEND SM_INCLUDE_DIRS ${DIRECTX_INCLUDE_DIR}) else() list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/libpng/include") endif()