Changeset 9624 in vbox

Timestamp:

Jun 11, 2008 7:14:45 PM (16 years ago)

Author:

vboxsync

Message:

Enabled the 64-bit guest additions building. Note that you'll have to use KBUILD_TARGET=<win|linux|solaris|whatever> and KBUILD_TARGET_ARCH=<x86|amd64> to crossbuild stuff now, win32 additions are no longer build by default on linux.

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Additions/WINNT/Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -143 +143 @@
 # (Ignored ifndef VBOX_WITH_ADDITIONS. Hack for 32/64 linux issues.)
 VBOX_WITH_ADDITION_DRIVERS = 1
-# Build win32 additions (cross building them on linux and l4 using wine).
-if1of ($(KBUILD_TARGET),l4 linux win)
+# Build windows additions.
+# Note! VBOX_WITH_WIN32_ADDITIONS will be removed later.
+if1of ($(KBUILD_TARGET), win)
  VBOX_WITH_WIN32_ADDITIONS = 1
 endif
 # Build linux additions.
-# Note! VBOX_WITH_LINUX_ADDITIONS will be removed later and only
-# VBOX_WITH_WIN32_ADDITIONS will be kept around for cross building.
+# Note! VBOX_WITH_LINUX_ADDITIONS will be removed later.
 if1of ($(KBUILD_TARGET),l4 linux)
  VBOX_WITH_LINUX_ADDITIONS = 1
@@ -302 +302 @@
 endif
 # Enable building 64-bit additions (actually KBUILD_TARGET_ARCH decides).
-ifeq ($(USERNAME),bird) # precaution
 VBOX_WITH_64BIT_ADDITIONS = 1
-endif
 
 #

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

@@ -29 +29 @@
 include $(PATH_SUB_CURRENT)/VBoxGuest/Makefile.kmk
 include $(PATH_SUB_CURRENT)/VBoxTray/Makefile.kmk
+ifneq ($(KBUILD_TARGET_ARCH),amd64) ## @todo Not 64-bit ready yet (minor issues).
 include $(PATH_SUB_CURRENT)/VBoxGINA/Makefile.kmk
+endif
 include $(PATH_SUB_CURRENT)/VBoxControl/Makefile.kmk
 include $(PATH_SUB_CURRENT)/VBoxHook/Makefile.kmk
@@ -37 +39 @@
 endif
 ifdef VBOX_WITH_WIN32_ADDITIONS_SHAREDFOLDERS
+ifneq ($(KBUILD_TARGET_ARCH),amd64) ## @todo Not 64-bit ready yet (build env issues).
 include $(PATH_SUB_CURRENT)/SharedFolders/Makefile.kmk
+endif
 endif
 ifneq ($(wildcard $(PATH_SUB_CURRENT)/Installer),)