Changeset 66826 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine_new

Timestamp:

May 8, 2017 4:53:25 PM (8 years ago)

Author:

vboxsync

Message:

Additions: Adjustments for Visual C++ v12 / Visual Studio 2013. New warnings and sal_supp.h conflict.

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new

Files:

• Makefile.kmk (modified) (2 diffs)
• vbox/libWineStub/include/wine/port.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/Makefile.kmk

@@ -52 +52 @@
 TEMPLATE_VBoxGuestWineDLL_CFLAGS = $(filter-out -WX,$(TEMPLATE_VBoxGuestR3Dll_CFLAGS)) \
         -wd4100  -wd4204 -wd4245 -wd4305 -wd4018 -wd4389 -wd4221 -wd4334 -wd4267
+if1of ($(VBOX_VCC_TOOL_STEM), VCC120)
+  # -wd4005: v7.1\include\sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition
+  # -wd4133: swapchain.c(384) : warning C4133: 'function' : incompatible types - from 'IDirect3DSwapChain9 *' to 'IDirect3DSwapChain9Ex *'
+ TEMPLATE_VBoxGuestWineDLL_CFLAGS += -wd4005 -wd4133
+endif
 
 #
@@ -65 +70 @@
 TEMPLATE_VBoxGuestWineD3DxDLL_DEFS = VBOX_WINE_WITH_IPRT
 TEMPLATE_VBoxGuestWineD3DxDLL_CFLAGS = -wd4100  -wd4204 -wd4245 -wd4305
+if1of ($(VBOX_VCC_TOOL_STEM), VCC120)
+ TEMPLATE_VBoxGuestWineD3DxDLL_CFLAGS += -wd4005
+endif
 TEMPLATE_VBoxGuestWineD3DxDLL_LIBS = \
         $(VBOX_LIB_IPRT_GUEST_R3) \

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/include/wine/port.h

@@ -276 +276 @@
 
 #ifndef HAVE_ISINF
+# undef isinf /* VBox: _MSC_VER >= RT_MSC_VER_VC120 has complicated macro implementation in math.h */
 int isinf(double x);
 #endif
 
 #ifndef HAVE_ISNAN
+# undef isnan /* VBox: _MSC_VER >= RT_MSC_VER_VC120 has complicated macro implementation in math.h */
 int isnan(double x);
 #endif