diff --git a/3rdparty/d3drm/d3drm.c b/3rdparty/d3drm/d3drm.c index bcce79d9..cde2f868 100644 --- a/3rdparty/d3drm/d3drm.c +++ b/3rdparty/d3drm/d3drm.c @@ -2331,12 +2331,17 @@ HRESULT WINAPI Direct3DRMCreate(IDirect3DRM **d3drm) #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" +#elif defined(_MSC_VER) +#pragma warning( push ) +#pragma warning( disable : 4090 ) /* different 'const' qualifiers */ #endif object->IDirect3DRM_iface.lpVtbl = &d3drm1_vtbl; object->IDirect3DRM2_iface.lpVtbl = &d3drm2_vtbl; object->IDirect3DRM3_iface.lpVtbl = &d3drm3_vtbl; #ifdef __GNUC__ #pragma GCC diagnostic pop +#elif defined(_MSC_VER) +#pragma warning( pop ) #endif object->ref1 = 1; object->iface_count = 1; diff --git a/3rdparty/d3drm/device.c b/3rdparty/d3drm/device.c index a66c014a..a8ef3c4e 100644 --- a/3rdparty/d3drm/device.c +++ b/3rdparty/d3drm/device.c @@ -1666,6 +1666,9 @@ HRESULT d3drm_device_create(struct d3drm_device **device, IDirect3DRM *d3drm) #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" +#elif defined(_MSC_VER) +#pragma warning( push ) +#pragma warning( disable : 4090 ) /* different 'const' qualifiers */ #endif object->IDirect3DRMDevice_iface.lpVtbl = &d3drm_device1_vtbl; object->IDirect3DRMDevice2_iface.lpVtbl = &d3drm_device2_vtbl; @@ -1673,6 +1676,8 @@ HRESULT d3drm_device_create(struct d3drm_device **device, IDirect3DRM *d3drm) object->IDirect3DRMWinDevice_iface.lpVtbl = &d3drm_device_win_vtbl; #ifdef __GNUC__ #pragma GCC diagnostic pop +#elif defined(_MSC_VER) +#pragma warning( pop ) #endif object->d3drm = d3drm; d3drm_object_init(&object->obj, classname); diff --git a/3rdparty/d3drm/face.c b/3rdparty/d3drm/face.c index 6da5a685..72a03d82 100644 --- a/3rdparty/d3drm/face.c +++ b/3rdparty/d3drm/face.c @@ -630,11 +630,16 @@ HRESULT d3drm_face_create(struct d3drm_face **face) #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" +#elif defined(_MSC_VER) +#pragma warning( push ) +#pragma warning( disable : 4090 ) /* different 'const' qualifiers */ #endif object->IDirect3DRMFace_iface.lpVtbl = &d3drm_face1_vtbl; object->IDirect3DRMFace2_iface.lpVtbl = &d3drm_face2_vtbl; #ifdef __GNUC__ #pragma GCC diagnostic pop +#elif defined(_MSC_VER) +#pragma warning( pop ) #endif object->ref = 1; diff --git a/3rdparty/d3drm/frame.c b/3rdparty/d3drm/frame.c index ca26dac3..2f6e0275 100644 --- a/3rdparty/d3drm/frame.c +++ b/3rdparty/d3drm/frame.c @@ -264,10 +264,15 @@ static struct d3drm_frame_array *d3drm_frame_array_create(unsigned int frame_cou #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" +#elif defined(_MSC_VER) +#pragma warning( push ) +#pragma warning( disable : 4090 ) /* different 'const' qualifiers */ #endif array->IDirect3DRMFrameArray_iface.lpVtbl = &d3drm_frame_array_vtbl; #ifdef __GNUC__ #pragma GCC diagnostic pop +#elif defined(_MSC_VER) +#pragma warning( pop ) #endif array->ref = 1; array->size = frame_count; @@ -389,10 +394,15 @@ static struct d3drm_visual_array *d3drm_visual_array_create(unsigned int visual_ #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" +#elif defined(_MSC_VER) +#pragma warning( push ) +#pragma warning( disable : 4090 ) /* different 'const' qualifiers */ #endif array->IDirect3DRMVisualArray_iface.lpVtbl = &d3drm_visual_array_vtbl; #ifdef __GNUC__ #pragma GCC diagnostic pop +#elif defined(_MSC_VER) +#pragma warning( pop ) #endif array->ref = 1; array->size = visual_count; @@ -515,10 +525,15 @@ static struct d3drm_light_array *d3drm_light_array_create(unsigned int light_cou #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" +#elif defined(_MSC_VER) +#pragma warning( push ) +#pragma warning( disable : 4090 ) /* different 'const' qualifiers */ #endif array->IDirect3DRMLightArray_iface.lpVtbl = &d3drm_light_array_vtbl; #ifdef __GNUC__ #pragma GCC diagnostic pop +#elif defined(_MSC_VER) +#pragma warning( pop ) #endif array->ref = 1; array->size = light_count; @@ -3161,12 +3176,17 @@ HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, I #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" +#elif defined(_MSC_VER) +#pragma warning( push ) +#pragma warning( disable : 4090 ) /* different 'const' qualifiers */ #endif object->IDirect3DRMFrame_iface.lpVtbl = &d3drm_frame1_vtbl; object->IDirect3DRMFrame2_iface.lpVtbl = &d3drm_frame2_vtbl; object->IDirect3DRMFrame3_iface.lpVtbl = &d3drm_frame3_vtbl; #ifdef __GNUC__ #pragma GCC diagnostic pop +#elif defined(_MSC_VER) +#pragma warning( pop ) #endif object->d3drm = d3drm; object->ref = 1; @@ -3920,11 +3940,16 @@ HRESULT d3drm_animation_create(struct d3drm_animation **animation, IDirect3DRM * #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" +#elif defined(_MSC_VER) +#pragma warning( push ) +#pragma warning( disable : 4090 ) /* different 'const' qualifiers */ #endif object->IDirect3DRMAnimation_iface.lpVtbl = &d3drm_animation1_vtbl; object->IDirect3DRMAnimation2_iface.lpVtbl = &d3drm_animation2_vtbl; #ifdef __GNUC__ #pragma GCC diagnostic pop +#elif defined(_MSC_VER) +#pragma warning( pop ) #endif object->d3drm = d3drm; object->ref = 1; diff --git a/3rdparty/d3drm/include/d3drmdef.h b/3rdparty/d3drm/include/d3drmdef.h index aa77c2c5..859df046 100644 --- a/3rdparty/d3drm/include/d3drmdef.h +++ b/3rdparty/d3drm/include/d3drmdef.h @@ -28,6 +28,10 @@ extern "C" { #endif +#ifndef __MSABI_LONG +#define __MSABI_LONG(X) (X) +#endif + typedef struct _D3DRMVECTOR4D { D3DVALUE x; diff --git a/3rdparty/d3drm/include/d3drmobj.h b/3rdparty/d3drm/include/d3drmobj.h index e91d50ab..4ff8c853 100644 --- a/3rdparty/d3drm/include/d3drmobj.h +++ b/3rdparty/d3drm/include/d3drmobj.h @@ -29,6 +29,10 @@ extern "C" { #endif +#ifdef INTERFACE +#undef INTERFACE +#endif + /* Direct3DRM object CLSIDs */ DEFINE_GUID(CLSID_CDirect3DRMDevice, 0x4fa3568e, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); diff --git a/3rdparty/d3drm/light.c b/3rdparty/d3drm/light.c index 86dc502a..66b255ce 100644 --- a/3rdparty/d3drm/light.c +++ b/3rdparty/d3drm/light.c @@ -381,10 +381,15 @@ HRESULT d3drm_light_create(struct d3drm_light **light, IDirect3DRM *d3drm) #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" +#elif defined(_MSC_VER) +#pragma warning( push ) +#pragma warning( disable : 4090 ) /* different 'const' qualifiers */ #endif object->IDirect3DRMLight_iface.lpVtbl = &d3drm_light_vtbl; #ifdef __GNUC__ #pragma GCC diagnostic pop +#elif defined(_MSC_VER) +#pragma warning( pop ) #endif object->ref = 1; object->d3drm = d3drm; diff --git a/3rdparty/d3drm/material.c b/3rdparty/d3drm/material.c index f40707db..ed2e40ca 100644 --- a/3rdparty/d3drm/material.c +++ b/3rdparty/d3drm/material.c @@ -289,10 +289,15 @@ HRESULT d3drm_material_create(struct d3drm_material **material, IDirect3DRM *d3d #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" +#elif defined(_MSC_VER) +#pragma warning( push ) +#pragma warning( disable : 4090 ) /* different 'const' qualifiers */ #endif object->IDirect3DRMMaterial2_iface.lpVtbl = &d3drm_material_vtbl; #ifdef __GNUC__ #pragma GCC diagnostic pop +#elif defined(_MSC_VER) +#pragma warning( pop ) #endif object->ref = 1; object->d3drm = d3drm; diff --git a/3rdparty/d3drm/meshbuilder.c b/3rdparty/d3drm/meshbuilder.c index 56faa038..5aab5cf1 100644 --- a/3rdparty/d3drm/meshbuilder.c +++ b/3rdparty/d3drm/meshbuilder.c @@ -2346,11 +2346,16 @@ HRESULT d3drm_mesh_builder_create(struct d3drm_mesh_builder **mesh_builder, IDir #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" +#elif defined(_MSC_VER) +#pragma warning( push ) +#pragma warning( disable : 4090 ) /* different 'const' qualifiers */ #endif object->IDirect3DRMMeshBuilder2_iface.lpVtbl = &d3drm_mesh_builder2_vtbl; object->IDirect3DRMMeshBuilder3_iface.lpVtbl = &d3drm_mesh_builder3_vtbl; #ifdef __GNUC__ #pragma GCC diagnostic pop +#elif defined(_MSC_VER) +#pragma warning( pop ) #endif object->ref = 1; object->d3drm = d3drm; @@ -2853,10 +2858,15 @@ HRESULT d3drm_mesh_create(struct d3drm_mesh **mesh, IDirect3DRM *d3drm) #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" +#elif defined(_MSC_VER) +#pragma warning( push ) +#pragma warning( disable : 4090 ) /* different 'const' qualifiers */ #endif object->IDirect3DRMMesh_iface.lpVtbl = &d3drm_mesh_vtbl; #ifdef __GNUC__ #pragma GCC diagnostic pop +#elif defined(_MSC_VER) +#pragma warning( pop ) #endif object->ref = 1; object->d3drm = d3drm; @@ -3046,10 +3056,15 @@ HRESULT d3drm_wrap_create(struct d3drm_wrap **wrap, IDirect3DRM *d3drm) #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" +#elif defined(_MSC_VER) +#pragma warning( push ) +#pragma warning( disable : 4090 ) /* different 'const' qualifiers */ #endif object->IDirect3DRMWrap_iface.lpVtbl = &d3drm_wrap_vtbl; #ifdef __GNUC__ #pragma GCC diagnostic pop +#elif defined(_MSC_VER) +#pragma warning( pop ) #endif object->ref = 1; diff --git a/3rdparty/d3drm/texture.c b/3rdparty/d3drm/texture.c index 19fa3bb0..f967dbae 100644 --- a/3rdparty/d3drm/texture.c +++ b/3rdparty/d3drm/texture.c @@ -1470,12 +1470,17 @@ HRESULT d3drm_texture_create(struct d3drm_texture **texture, IDirect3DRM *d3drm) #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" +#elif defined(_MSC_VER) +#pragma warning( push ) +#pragma warning( disable : 4090 ) /* different 'const' qualifiers */ #endif object->IDirect3DRMTexture_iface.lpVtbl = &d3drm_texture1_vtbl; object->IDirect3DRMTexture2_iface.lpVtbl = &d3drm_texture2_vtbl; object->IDirect3DRMTexture3_iface.lpVtbl = &d3drm_texture3_vtbl; #ifdef __GNUC__ #pragma GCC diagnostic pop +#elif defined(_MSC_VER) +#pragma warning( pop ) #endif object->d3drm = d3drm; object->max_colors = 8; diff --git a/3rdparty/d3drm/viewport.c b/3rdparty/d3drm/viewport.c index 347f2c1a..420e2f18 100644 --- a/3rdparty/d3drm/viewport.c +++ b/3rdparty/d3drm/viewport.c @@ -1139,11 +1139,16 @@ HRESULT d3drm_viewport_create(struct d3drm_viewport **viewport, IDirect3DRM *d3d #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" +#elif defined(_MSC_VER) +#pragma warning( push ) +#pragma warning( disable : 4090 ) /* different 'const' qualifiers */ #endif object->IDirect3DRMViewport_iface.lpVtbl = &d3drm_viewport1_vtbl; object->IDirect3DRMViewport2_iface.lpVtbl = &d3drm_viewport2_vtbl; #ifdef __GNUC__ #pragma GCC diagnostic pop +#elif defined(_MSC_VER) +#pragma warning( pop ) #endif object->d3drm = d3drm; d3drm_object_init(&object->obj, classname);