diff options
| author | Nicky Dasmijn <nicky.dasmijn@phoenixviewer.com> | 2020-05-19 19:17:32 +0200 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-05-20 10:46:57 -0400 |
| commit | e29ba3bbdaf70127944389d3b4910d47dcf02aff (patch) | |
| tree | fb35c227fc524e3fd6e168e9c4c2bf00d30b20af | |
| parent | 68bfa4538f5c8229e43ead6617c3675aa64d12f5 (diff) | |
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
| -rw-r--r-- | indra/newview/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | indra/win_crash_logger/CMakeLists.txt | 4 |
2 files changed, 2 insertions, 12 deletions
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 diff --git a/indra/win_crash_logger/CMakeLists.txt b/indra/win_crash_logger/CMakeLists.txt index 1b038c26b5..86aa655f03 100644 --- a/indra/win_crash_logger/CMakeLists.txt +++ b/indra/win_crash_logger/CMakeLists.txt @@ -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 |