Changeset 41432 in vbox for trunk/src/VBox/Additions/WINNT/Graphics

Timestamp:

May 24, 2012 12:05:44 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

78158

Message:

don't build libwine & don't include it in GA installer

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine

Files:

• Makefile.kmk (modified) (2 diffs)
• include/wine/debug.h (modified) (1 diff)

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

@@ -20 +20 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-# @todo: get rid of libwine completely (currently used for xpdm.x86 builds only)
+if 0
 DLLS.x86 += libWine
 
@@ -115 +115 @@
     libWine/c_28606.c \
     libWine/version.c
+endif
 
 DLLS += wined3d
-# @todo: all .amd64 and .x86 stuff below is to get rid of libwine for amd64
-#        and keep it for .x86 to avoid regressions
-#        this should be generalized in the future
 wined3d_TEMPLATE     = VBOXGUESTR3NPDLL
 wined3d_DEFS         = __WINESRC__ WINE_UNICODE_API="" _REENTRANT WINE_NOWINSOCK USE_WIN32_OPENGL _USE_MATH_DEFINES\

trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/debug.h

@@ -31 +31 @@
 #define __WINE_WINE_DEBUG_H
 
-#if defined(VBOX_WITH_WDDM) || defined(VBOX_WINE_WITH_IPRT)
-# error "Unexpected include! VBOX_WITH_WDDM or VBOX_WINE_WITH_IPRT are defined!"
-#endif
+#error "Unexpected include! VBOX_WITH_WDDM or VBOX_WINE_WITH_IPRT are defined!"
+
 
 #ifdef VBOX_WINE_WITH_IPRT