mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-02-12 23:48:58 +01:00
Merge pull request #5482 from ligfx/cmakeremoved3d12
CMake: remove references to D3D12
This commit is contained in:
commit
260fd5e0f8
1553
Externals/d3dx12/d3dx12.h
vendored
1553
Externals/d3dx12/d3dx12.h
vendored
File diff suppressed because it is too large
Load Diff
2
Externals/licenses.md
vendored
2
Externals/licenses.md
vendored
@ -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)
|
[LGPLv2.1+](https://git.kernel.org/cgit/bluetooth/bluez.git/tree/COPYING.LIB)
|
||||||
- [Bochs](http://bochs.sourceforge.net/):
|
- [Bochs](http://bochs.sourceforge.net/):
|
||||||
[LGPLv2.1+](http://bochs.sourceforge.net/cgi-bin/lxr/source/COPYING)
|
[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/):
|
- [ENet](http://enet.bespin.org/):
|
||||||
[MIT](http://enet.bespin.org/License.html)
|
[MIT](http://enet.bespin.org/License.html)
|
||||||
- [GCEmu](http://sourceforge.net/projects/gcemu-project/):
|
- [GCEmu](http://sourceforge.net/projects/gcemu-project/):
|
||||||
|
@ -300,7 +300,6 @@ if(WIN32)
|
|||||||
set(SRCS ${SRCS} HW/EXI/BBA-TAP/TAP_Win32.cpp HW/WiimoteReal/IOWin.cpp)
|
set(SRCS ${SRCS} HW/EXI/BBA-TAP/TAP_Win32.cpp HW/WiimoteReal/IOWin.cpp)
|
||||||
list(APPEND LIBS
|
list(APPEND LIBS
|
||||||
videod3d
|
videod3d
|
||||||
videod3d12
|
|
||||||
setupapi.lib
|
setupapi.lib
|
||||||
iphlpapi.lib
|
iphlpapi.lib
|
||||||
)
|
)
|
||||||
|
@ -4,7 +4,6 @@ add_subdirectory(Software)
|
|||||||
|
|
||||||
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
|
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
|
||||||
add_subdirectory(D3D)
|
add_subdirectory(D3D)
|
||||||
add_subdirectory(D3D12)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT APPLE)
|
if(NOT APPLE)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user