Changeset 34801 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Display

Timestamp:

Dec 7, 2010 4:25:14 PM (14 years ago)

Author:

vboxsync

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

68611

Message:

Cross building 32-bit additions binaries while building the win.amd64 additions.

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Display

Files:

• Makefile.kmk (modified) (3 diffs)
• wddm/VBoxDispD3D64.def (modified) (2 diffs)

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

@@ -65 +65 @@
 ifdef VBOX_WITH_WDDM
 
- ifeq ($(KBUILD_TARGET_ARCH), amd64)
- # VBOXDISP_BUILD_32WITH64=1
-  ifndef VBOXDISP_BUILD_32WITH64
-   $(warning VBoxVideoD3D: make it 32bit for 64bit builds)
-  endif
- endif
-
+#
+# Please add description.
+#
 DLLS += VBoxDispD3D
  if defined(VBOX_SIGNING_MODE)
 VBoxDispD3D_NOINST = true
  endif
- ifdef VBOXDISP_BUILD_32WITH64
-VBoxDispD3D_BLD_TRG_ARCH = x86
- endif
+VBoxDispD3D_NAME.amd64 = VBoxDispD3D64
 VBoxDispD3D_TEMPLATE = VBOXGUESTR3DLL
 VBoxDispD3D_DEFS     = UNICODE _UNICODE VBOX_WITH_WDDM VBOXWDDMDISP
@@ -95 +89 @@
  VBoxDispD3D_DEFS   += VBOXWDDM_TEST_UHGSMI
 endif
+VBoxDispD3D_SOURCES.x86  = \
+        wddm/VBoxDispD3D.def
+VBoxDispD3D_SOURCES.amd64  = \
+        wddm/VBoxDispD3D64.def
 VBoxDispD3D_SOURCES  = \
         wddm/VBoxDispD3D.cpp \
-    wddm/VBoxDispD3DIf.cpp \
-    wddm/VBoxDispCm.cpp \
-    wddm/VBoxDispMp.cpp \
-    wddm/VBoxScreen.cpp \
-    wddm/VBoxDispMpTst.cpp \
-        wddm/VBoxDispD3D.def \
+        wddm/VBoxDispD3DIf.cpp \
+        wddm/VBoxDispCm.cpp \
+        wddm/VBoxDispMp.cpp \
+        wddm/VBoxScreen.cpp \
+        wddm/VBoxDispMpTst.cpp \
         wddm/VBoxDispD3D.rc
 #ifdef VBOX_WITH_CRHGSMI
@@ -116 +113 @@
 # VBoxDispD3D_INCS    += ../Wine/include
 
- ifeq ($(KBUILD_TARGET_ARCH), amd64)
-DLLS += VBoxDispD3D64
-VBoxDispD3D64_EXTENDS  = VBoxDispD3D
-VBoxDispD3D64_SOURCES  = $(subst VBoxDispD3D.def,VBoxDispD3D64.def,$(VBoxDispD3D_SOURCES))
-  ifdef VBOXDISP_BUILD_32WITH64
-VBoxDispD3D64_BLD_TRG_ARCH = amd64
-  endif
- endif
+
+#
+# 64-bit systems needs a 32-bit version of VBoxDispD3D.
+#
+DLLS.amd64 += VBoxDispD3D-x86
+VBoxDispD3D-x86_EXTENDS = VBoxDispD3D
+VBoxDispD3D-x86_NAME = VBoxDispD3D
+VBoxDispD3D-x86_BLD_TRG_ARCH = x86
+VBoxDispD3D-x86_LIBS = \
+        $(VBOX_LIB_IPRT_GUEST_R3_X86) \
+        $(VBOX_LIB_VBGL_R3_X86)
 
  ifdef VBOX_WITH_CRHGSMI

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D64.def

@@ -1 @@
-;/** @file
-; *
-; * VBoxDispD3D 64bit
-; *
+; $Id$
+;; @file
+;
+; VBoxDispD3D 64bit
+;
 ; Copyright (C) 2010 Oracle Corporation
 ;
@@ -13 +14 @@
 ; hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
 ;
-; */
+;
 
 LIBRARY VBoxDispD3D64