diff --git a/3rdparty/d3drm/CMakeLists.txt b/3rdparty/d3drm/CMakeLists.txt index 3ef12866..8db17833 100644 --- a/3rdparty/d3drm/CMakeLists.txt +++ b/3rdparty/d3drm/CMakeLists.txt @@ -45,12 +45,8 @@ add_library(d3drm-wine SHARED 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() if(WINE_D3DRM_DYNAMIC_D3DXOF) target_sources(d3drm-wine PRIVATE dyn_d3dxof.c dyn_d3dxof.h) target_compile_definitions(d3drm-wine PRIVATE DYNAMIC_D3DXOF) diff --git a/3rdparty/d3drm/d3drm64.def b/3rdparty/d3drm/d3drm.def similarity index 89% rename from 3rdparty/d3drm/d3drm64.def rename to 3rdparty/d3drm/d3drm.def index 31aec2dc..f8c0a465 100644 --- a/3rdparty/d3drm/d3drm64.def +++ b/3rdparty/d3drm/d3drm.def @@ -20,3 +20,5 @@ EXPORTS D3DRMVectorScale D3DRMVectorSubtract Direct3DRMCreate + ; DllCanUnloadNow PRIVATE + DllGetClassObject PRIVATE \ No newline at end of file diff --git a/3rdparty/d3drm/d3drm32.def b/3rdparty/d3drm/d3drm32.def deleted file mode 100644 index ae143f3e..00000000 --- a/3rdparty/d3drm/d3drm32.def +++ /dev/null @@ -1,22 +0,0 @@ -EXPORTS - D3DRMColorGetAlpha@4 - D3DRMColorGetBlue@4 - D3DRMColorGetGreen@4 - D3DRMColorGetRed@4 - D3DRMCreateColorRGB@12 - D3DRMCreateColorRGBA@16 - D3DRMMatrixFromQuaternion@8 - D3DRMQuaternionFromRotation@12 - D3DRMQuaternionMultiply@12 - D3DRMQuaternionSlerp@16 - D3DRMVectorAdd@12 - D3DRMVectorCrossProduct@12 - D3DRMVectorDotProduct@8 - D3DRMVectorModulus@4 - D3DRMVectorNormalize@4 - D3DRMVectorRandom@4 - D3DRMVectorReflect@12 - D3DRMVectorRotate@16 - D3DRMVectorScale@12 - D3DRMVectorSubtract@12 - Direct3DRMCreate@4