Merge pull request #5482 from ligfx/cmakeremoved3d12

CMake: remove references to D3D12
2017-05-26 11:30:47 +02:00 · 2017-05-26 11:30:47 +02:00 · 260fd5e0f8
parent f8cf43cce4 abaec0be8f
commit 260fd5e0f8
4 changed files with 0 additions and 1557 deletions
--- a/Externals/d3dx12/d3dx12.h
+++ b/Externals/d3dx12/d3dx12.h
--- a/Externals/licenses.md
+++ b/Externals/licenses.md
@ -6,8 +6,6 @@ Dolphin includes or links code of the following third-party software projects:
   [LGPLv2.1+](https://git.kernel.org/cgit/bluetooth/bluez.git/tree/COPYING.LIB)
 - [Bochs](http://bochs.sourceforge.net/):
   [LGPLv2.1+](http://bochs.sourceforge.net/cgi-bin/lxr/source/COPYING)
- [d3dx12.h](https://github.com/Microsoft/DirectX-Graphics-Samples/blob/master/Samples/D3D1211On12/src/d3dx12.h):
-   [MIT](https://github.com/Microsoft/DirectX-Graphics-Samples/blob/master/LICENSE)
 - [ENet](http://enet.bespin.org/):
   [MIT](http://enet.bespin.org/License.html)
 - [GCEmu](http://sourceforge.net/projects/gcemu-project/):
--- a/Source/Core/Core/CMakeLists.txt
+++ b/Source/Core/Core/CMakeLists.txt
@ -300,7 +300,6 @@ if(WIN32)
  set(SRCS ${SRCS} HW/EXI/BBA-TAP/TAP_Win32.cpp HW/WiimoteReal/IOWin.cpp)
  list(APPEND LIBS
    videod3d
-    videod3d12
    setupapi.lib
    iphlpapi.lib
  )
--- a/Source/Core/VideoBackends/CMakeLists.txt
+++ b/Source/Core/VideoBackends/CMakeLists.txt
@ -4,7 +4,6 @@ add_subdirectory(Software)

 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
  add_subdirectory(D3D)
-  add_subdirectory(D3D12)
 endif()

 if(NOT APPLE)