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

Define D3DRM_WINE when using d3drm from wine

Browse Source
This commit is contained in:
Anonymous Maarten 2024-06-26 17:00:32 +02:00
parent 7f08e4d1d7
commit 382d24b097
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -470,6 +470,7 @@ 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>>)
target_link_libraries(${tgt} PRIVATE $<$<BOOL:${ISLE_USE_DX5}>:DirectX5::DirectX5> SDL3::SDL3) target_link_libraries(${tgt} PRIVATE $<$<BOOL:${ISLE_USE_DX5}>:DirectX5::DirectX5> SDL3::SDL3)
target_compile_definitions(${tgt} PRIVATE $<$<BOOL:${ISLE_USE_DX5}>:DIRECTX5_SDK>) target_compile_definitions(${tgt} PRIVATE $<$<BOOL:${ISLE_USE_DX5}>:DIRECTX5_SDK>)
target_compile_definitions(${tgt} PRIVATE $<$<BOOL:${ISLE_D3DRM_FROM_WINE}>:D3DRM_WINE>)
endforeach() endforeach()
# Make sure filenames are ALL CAPS # Make sure filenames are ALL CAPS

2
LEGO1/tgl/d3drm/impl.h
View File

@ -5,7 +5,7 @@
#include <d3drm.h> #include <d3drm.h>
#ifdef DIRECTX5_SDK #ifndef D3DRM_WINE
typedef DWORD LPD3DRM_APPDATA; typedef DWORD LPD3DRM_APPDATA;
#else #else
typedef LPVOID LPD3DRM_APPDATA; typedef LPVOID LPD3DRM_APPDATA;