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

Timestamp:

Dec 7, 2010 3:37:43 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: 32bit VBoxDispD3D.dll for amd64 (disabled)

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk (modified) (4 diffs)

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

@@ -66 +66 @@
 
  ifeq ($(KBUILD_TARGET_ARCH), amd64)
-  $(warning VBoxVideoD3D: make it 32bit for 64bit builds)
+ # VBOXDISP_BUILD_32WITH64=1
+  ifndef VBOXDISP_BUILD_32WITH64
+   $(warning VBoxVideoD3D: make it 32bit for 64bit builds)
+  endif
  endif
 
@@ -72 +75 @@
  if defined(VBOX_SIGNING_MODE)
 VBoxDispD3D_NOINST = true
+ endif
+ ifdef VBOXDISP_BUILD_32WITH64
+VBoxDispD3D_BLD_TRG_ARCH = x86
  endif
 VBoxDispD3D_TEMPLATE = VBOXGUESTR3DLL
@@ -110 +116 @@
 # VBoxDispD3D_INCS    += ../Wine/include
 
- ifeq ($(KBUILD_TARGET_ARCH), amd64)
+ ifdef VBOXDISP_BUILD_32WITH64
 DLLS += VBoxDispD3D64
 VBoxDispD3D64_EXTENDS  = VBoxDispD3D
 VBoxDispD3D64_SOURCES  = $(subst VBoxDispD3D.def,VBoxDispD3D64.def,$(VBoxDispD3D_SOURCES))
+VBoxDispD3D64_BLD_TRG_ARCH = amd64
  endif
-endif
 
-ifdef VBOX_WITH_CRHGSMI
+ ifdef VBOX_WITH_CRHGSMI
 #
 # VBoxCrHgsmi
@@ -128 +134 @@
         wddm/VBoxUhgsmiKmt.cpp
 VBoxCrHgsmi_SDKS        = WINDDKWLH
+ endif
 endif