123456789101112131415161718192021222324252627282930313233 |
- diff --git a/CMakeLists.txt b/CMakeLists.txt
- index 9f90c8d..5ce5651 100644
- --- a/CMakeLists.txt
- +++ b/CMakeLists.txt
- @@ -39,19 +39,25 @@ target_include_directories(DirectX-Headers SYSTEM PUBLIC
- )
- target_include_directories(DirectX-Headers PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/directx)
-
- +add_library(DirectX-Guids STATIC src/dxguids.cpp)
- +target_link_libraries(DirectX-Guids PRIVATE DirectX-Headers)
- +
- # For non-Windows targets, also add the WSL stubs to the include path
- if (NOT WIN32)
- target_include_directories(DirectX-Headers SYSTEM PUBLIC
- "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/wsl/stubs>"
- "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/wsl/stubs>"
- )
- +elseif((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang"))
- + # MinGW has RPC headers which define old versions, and complain if D3D
- + # headers are included before the RPC headers, since D3D headers were
- + # generated with new MIDL and "require" new RPC headers.
- + target_compile_options(DirectX-Headers PRIVATE "-D__REQUIRED_RPCNDR_H_VERSION__=475")
- + target_compile_options(DirectX-Guids PRIVATE "-D__REQUIRED_RPCNDR_H_VERSION__=475")
- endif()
-
- add_library(Microsoft::DirectX-Headers ALIAS DirectX-Headers)
-
- -add_library(DirectX-Guids STATIC src/dxguids.cpp)
- -target_link_libraries(DirectX-Guids PRIVATE DirectX-Headers)
- -
- add_library(Microsoft::DirectX-Guids ALIAS DirectX-Guids)
-
- if (DXHEADERS_INSTALL)
|