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

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Additions/WINNT

Files:

• Graphics/Wine/Makefile.kmk (modified) (2 diffs)
• Graphics/Wine/include/wine/debug.h (modified) (1 diff)
• Installer/Makefile.kmk (modified) (2 diffs)
• Installer/VBoxGuestAdditions.nsi (modified) (2 diffs)
• Installer/VBoxGuestAdditionsCommon.nsh (modified) (2 diffs)

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

trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

@@ -113 +113 @@
         $(PATH_STAGE_BIN)/additions/VBoxD3D9.dll \
         $(PATH_STAGE_BIN)/additions/VBoxD3D8.dll
- ifeq ($(KBUILD_TARGET_ARCH),x86)
-DRIVER_FILES += \
-        $(PATH_STAGE_BIN)/additions/libWine.dll
- endif
  ifeq ($(KBUILD_TARGET_ARCH),amd64)
         # Also include 32-bit DLLs on 64-bit guests to enable
@@ -127 +123 @@
                 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGLpassthroughspu.dll \
                 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGLfeedbackspu.dll \
-                $(VBOX_PATH_ADDITIONS.win.x86)/libWine.dll \
                 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGL.dll \
                 $(VBOX_PATH_ADDITIONS.win.x86)/wined3d.dll \

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

@@ -788 +788 @@
   SetOutPath $g_strSystemDir
   DetailPrint "Installing Direct3D support ..."
-  !if $%BUILD_TARGET_ARCH% == "x86"
-    FILE "$%PATH_OUT%\bin\additions\libWine.dll"
-  !endif
   FILE "$%PATH_OUT%\bin\additions\VBoxD3D8.dll"
   FILE "$%PATH_OUT%\bin\additions\VBoxD3D9.dll"
@@ -840 +837 @@
     SetOutPath $g_strSysWow64
     DetailPrint "Installing Direct3D support for 32-bit applications (SysWOW64: $g_strSysWow64) ..."
-    FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\libWine.dll"
     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxD3D8.dll"
     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxD3D9.dll"

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh

@@ -75 +75 @@
   FILE "$%PATH_OUT%\bin\additions\d3d8.dll"
   FILE "$%PATH_OUT%\bin\additions\d3d9.dll"
-  !if $%BUILD_TARGET_ARCH% == "x86"
-    ; libWine is used for 32bit d3d only
-    ; @todo: remove it for 32bit as well
-    FILE "$%PATH_OUT%\bin\additions\libWine.dll"
-  !endif
   FILE "$%PATH_OUT%\bin\additions\VBoxD3D8.dll"
   FILE "$%PATH_OUT%\bin\additions\VBoxD3D9.dll"
@@ -89 +84 @@
     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll"
     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll"
-    FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\libWine.dll"
     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLarrayspu.dll"
     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLcrutil.dll"