livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
Nicky Dasmijn 2020-05-19 19:17:32 +02:00 committed by Nat Goodspeed
parent 68bfa4538f
commit e29ba3bbda
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/CMakeLists.txt
View File

@ -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

4
indra/win_crash_logger/CMakeLists.txt
View File

@ -68,8 +68,6 @@ list(APPEND
${win_crash_logger_RESOURCE_FILES}
)
find_library(DXGUID_LIBRARY dxguid ${DIRECTX_LIBRARY_DIR})
add_executable(windows-crash-logger WIN32 ${win_crash_logger_SOURCE_FILES})
@ -87,7 +85,7 @@ target_link_libraries(windows-crash-logger
${BOOST_CONTEXT_LIBRARY}
${BOOST_FIBER_LIBRARY}
${WINDOWS_LIBRARIES}
${DXGUID_LIBRARY}
dxguid
${GOOGLE_PERFTOOLS_LIBRARIES}
user32
gdi32