diff --git a/3rdparty/d3drm/CMakeLists.txt b/3rdparty/d3drm/CMakeLists.txt index 4837d0b0..981cf004 100644 --- a/3rdparty/d3drm/CMakeLists.txt +++ b/3rdparty/d3drm/CMakeLists.txt @@ -17,9 +17,12 @@ add_library(d3drm-wine SHARED EXCLUDE_FROM_ALL texture.c version.rc viewport.c - - d3drm.def ) +if(CMAKE_SIZEOF_VOID_P EQUAL 4) + target_sources(d3drm-wine PRIVATE d3drm32.def) +else() + target_sources(d3drm-wine PRIVATE d3drm64.def) +endif() target_include_directories(d3drm-wine SYSTEM PUBLIC "${CMAKE_CURRENT_LIST_DIR}/include") target_link_libraries(d3drm-wine PRIVATE d3dxof ddraw) set_property(TARGET d3drm-wine PROPERTY PREFIX "") diff --git a/3rdparty/d3drm/d3drm.def b/3rdparty/d3drm/d3drm32.def similarity index 100% rename from 3rdparty/d3drm/d3drm.def rename to 3rdparty/d3drm/d3drm32.def diff --git a/3rdparty/d3drm/d3drm64.def b/3rdparty/d3drm/d3drm64.def new file mode 100644 index 00000000..31aec2dc --- /dev/null +++ b/3rdparty/d3drm/d3drm64.def @@ -0,0 +1,22 @@ +EXPORTS + D3DRMColorGetAlpha + D3DRMColorGetBlue + D3DRMColorGetGreen + D3DRMColorGetRed + D3DRMCreateColorRGB + D3DRMCreateColorRGBA + D3DRMMatrixFromQuaternion + D3DRMQuaternionFromRotation + D3DRMQuaternionMultiply + D3DRMQuaternionSlerp + D3DRMVectorAdd + D3DRMVectorCrossProduct + D3DRMVectorDotProduct + D3DRMVectorModulus + D3DRMVectorNormalize + D3DRMVectorRandom + D3DRMVectorReflect + D3DRMVectorRotate + D3DRMVectorScale + D3DRMVectorSubtract + Direct3DRMCreate diff --git a/CMakeLists.txt b/CMakeLists.txt index a7da16ba..cad5618a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -471,6 +471,7 @@ target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni target_link_libraries(lego1 PRIVATE tglrl viewmanager realtime mxdirectx roi geom anim Vec::Vec dxguid misc 3dmanager miniaudio omni) foreach(tgt IN LISTS lego1_targets) + target_include_directories(${tgt} PRIVATE $<$:$>) target_link_libraries(${tgt} PRIVATE $<$:DirectX5::DirectX5> SDL3::SDL3) target_compile_definitions(${tgt} PRIVATE $<$:DIRECTX5_SDK>) endforeach()