From e29ba3bbdaf70127944389d3b4910d47dcf02aff Mon Sep 17 00:00:00 2001
From: Nicky Dasmijn <nicky.dasmijn@phoenixviewer.com>
Date: Tue, 19 May 2020 19:17:32 +0200
Subject: Remove more traces of find_library to search for DirectX and instead
 rely on the SDK setup. Remove old dinput8 import library as it is not needed

---
 indra/newview/CMakeLists.txt | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 6f21ec93cc..460b2e6985 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1582,20 +1582,12 @@ if (WINDOWS)
         list(APPEND viewer_SOURCE_FILES ${viewer_RESOURCE_FILES})
     endif (NOT USESYSTEMLIBS)
 
-    find_library(DINPUT_LIBRARY dinput8 ${DIRECTX_LIBRARY_DIR})
-    find_library(DXGUID_LIBRARY dxguid ${DIRECTX_LIBRARY_DIR})
-    mark_as_advanced(
-        DINPUT_LIBRARY
-        DXGUID_LIBRARY
-        )
-
 # see EXP-1765 - theory is opengl32.lib needs to be included before gdi32.lib (windows libs)
     set(viewer_LIBRARIES
         opengl32
         ${WINDOWS_LIBRARIES}
         comdlg32
-        ${DINPUT_LIBRARY}
-        ${DXGUID_LIBRARY}
+        dxguid
         kernel32
         odbc32
         odbccp32
-- 
cgit v1.3