diff --git a/3rdparty/d3drm/CMakeLists.txt b/3rdparty/d3drm/CMakeLists.txt index 7659a7f8..b78f4450 100644 --- a/3rdparty/d3drm/CMakeLists.txt +++ b/3rdparty/d3drm/CMakeLists.txt @@ -20,6 +20,12 @@ if(MSVC) add_library(d3dxof INTERFACE) target_link_libraries(d3dxof INTERFACE "${imp}") add_dependencies(d3dxof "d3dxof-implib") + + add_library(d3drm_guid STATIC d3drm_guid.c) + target_include_directories(d3drm_guid PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include") +else() + set(d3drm_guid) + add_library(d3drm_guid INTERFACE) endif() add_library(d3drm-wine SHARED EXCLUDE_FROM_ALL diff --git a/3rdparty/d3drm/d3drm_guid.c b/3rdparty/d3drm/d3drm_guid.c new file mode 100644 index 00000000..5ec9f82f --- /dev/null +++ b/3rdparty/d3drm/d3drm_guid.c @@ -0,0 +1,3 @@ +#define INITGUID +#include +#include diff --git a/CMakeLists.txt b/CMakeLists.txt index a0645b3f..f2399512 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -472,7 +472,7 @@ target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include/actions") # Link libraries -target_link_libraries(lego1 PRIVATE tglrl viewmanager realtime mxdirectx roi geom anim Vec::Vec dxguid misc 3dmanager miniaudio omni) +target_link_libraries(lego1 PRIVATE tglrl viewmanager realtime mxdirectx roi geom anim Vec::Vec dxguid d3drm_guid misc 3dmanager miniaudio omni) foreach(tgt IN LISTS lego1_targets) target_include_directories(${tgt} PRIVATE $<$:$>)