Changeset 35328 in vbox

Timestamp:

Dec 24, 2010 5:25:45 PM (14 years ago)

Author:

vboxsync

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

69183

Message:

propper (hopefully) build fix

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Graphics/Display/Makefile.kmk (modified) (1 diff)
• GuestHost/OpenGL/Makefile.kmk (modified) (5 diffs)

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

@@ -136 +136 @@
 VBoxCrHgsmi_SDKS        = WINDDKWLH
 
-  ifeq ($(KBUILD_TARGET_ARCH),amd64)
-LIBRARIES += VBoxCrHgsmi-x86
+LIBRARIES.amd64 += VBoxCrHgsmi-x86
 VBoxCrHgsmi-x86_TEMPLATE    = VBOXGUESTR3LIB
 VBoxCrHgsmi-x86_EXTENDS = VBoxCrHgsmi
 VBoxCrHgsmi-x86_BLD_TRG_ARCH = x86
 VBoxCrHgsmi-x86_DEFS = $(VBoxCrHgsmi_DEFS) VBOX_WDDM_WOW64
-  endif
  endif
 endif

trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk

@@ -98 +98 @@
 VBoxOGLhostcrutil_pixel.c_CFLAGS.win.x86 += -Od
 
-ifdef VBOX_WITH_WDDM
+if defined(VBOX_WITH_WDDM) && !defined(VBOX_WITHOUT_ADDITIONS)
 #
 # VBoxOGLcrutil-x86 - x86 VBoxOGLcrutil version built for amd64 build 
@@ -242 +242 @@
         $(VBOX_PATH_CROGL_GENFILES)/state/cr_currentpointers.h
         
-ifdef VBOX_WITH_WDDM
+if defined(VBOX_WITH_WDDM) && !defined(VBOX_WITHOUT_ADDITIONS)
 #
 # VBoxOGLcrpacker-x86 - x86 VBoxOGLcrpacker version built for amd64 build 
@@ -321 +321 @@
 
 
-ifdef VBOX_WITH_WDDM
+if defined(VBOX_WITH_WDDM) && !defined(VBOX_WITHOUT_ADDITIONS)
 #
 # VBoxOGLspuload-x86 - x86 VBoxOGLspuload version built for amd64 build 
@@ -450 +450 @@
 
 
-ifdef VBOX_WITH_WDDM
+if defined(VBOX_WITH_WDDM) && !defined(VBOX_WITHOUT_ADDITIONS)
 #
 # VBoxOGLcrstate-x86 - x86 VBoxOGLcrstate version built for amd64 build 
@@ -571 +571 @@
         $(VBOX_LIB_OGL_CRUTIL)
         
-ifdef VBOX_WITH_WDDM
+if defined(VBOX_WITH_WDDM) && !defined(VBOX_WITHOUT_ADDITIONS)
 #
 # VBoxOGLerrorspu-x86 - x86 VBoxOGLerrorspu version built for amd64 build