isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-02-03 12:31:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Introduce d3drm_guid containing the guids of d3drm

Browse Source
This commit is contained in:
Anonymous Maarten 2024-06-26 00:51:48 +02:00
parent 5ebbf0b3a9
commit ccab074bf8
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3rdparty/d3drm/CMakeLists.txt vendored
View File

@ -20,6 +20,12 @@ if(MSVC)
add_library(d3dxof INTERFACE) add_library(d3dxof INTERFACE)
target_link_libraries(d3dxof INTERFACE "${imp}") target_link_libraries(d3dxof INTERFACE "${imp}")
add_dependencies(d3dxof "d3dxof-implib") 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() endif()
add_library(d3drm-wine SHARED EXCLUDE_FROM_ALL add_library(d3drm-wine SHARED EXCLUDE_FROM_ALL

3
3rdparty/d3drm/d3drm_guid.c vendored Normal file
View File

@ -0,0 +1,3 @@
#define INITGUID
#include <d3drm.h>
#include <d3drmwin.h>

2
CMakeLists.txt
View File

@ -466,7 +466,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") target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include/actions")
# Link libraries # 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) foreach(tgt IN LISTS lego1_targets)
target_include_directories(${tgt} PRIVATE $<$<BOOL:${ISLE_D3DRM_FROM_WINE}>:$<TARGET_PROPERTY:d3drm-wine,INTERFACE_INCLUDE_DIRECTORIES>>) target_include_directories(${tgt} PRIVATE $<$<BOOL:${ISLE_D3DRM_FROM_WINE}>:$<TARGET_PROPERTY:d3drm-wine,INTERFACE_INCLUDE_DIRECTORIES>>)