Changeset 9499

Timestamp:

06/08/08 02:44:31 (3 months ago)

Author:

vboxsync

Message:

Preparing 64-bit guest additions building (focusing on windows atm.)

Files:

• trunk/Config.kmk (modified) (8 diffs)
• trunk/src/VBox/Runtime/Makefile.kmk (modified) (7 diffs)

trunk/Config.kmk

@@ -300 +300 @@
-else
-# VBOX_WITH_64_BITS_GUESTS = 1
+endif
+# Enable building 64-bit additions (actually KBUILD_TARGET_ARCH decides).
+ifeq ($(USERNAME),bird) # precaution
+VBOX_WITH_64BIT_ADDITIONS = 1
-endif
-
@@ -817 +821 @@
-
-ifdef VBOX_WITH_64_BITS_GUESTS
-GC
-
-GC
-
-GC
+VBOX_GC_
+
+VBOX_GC_
+
+VBOX_GC_
-
-#
@@ -2587 +2591 @@
-TEMPLATE_VBOXW32GUESTR3_BLD_TRG_ARCH        = x86
-TEMPLATE_VBOXW32GUESTR3_BLD_TRG_CPU         = i386
-GC
+VBOX_GC_
-TEMPLATE_VBOXW32GUESTR3_RCDEFS              = \
-        VBOX_VERSION_MAJOR=\"$(VBOX_VERSION_MAJOR)\" \
@@ -2660 +2664 @@
-TEMPLATE_VBOXW32GUESTR0_BLD_TRG_ARCH        = x86
-TEMPLATE_VBOXW32GUESTR0_BLD_TRG_CPU         = i386
-GC
+VBOX_GC_
-TEMPLATE_VBOXW32GUESTR0_RCDEFS              = \
-        VBOX_VERSION_MAJOR=\"$(VBOX_VERSION_MAJOR)\" \
@@ -2766 +2770 @@
-#
-TEMPLATE_VBOXGUESTR3EXE           = VBox Guest Program
-
-
-
+
+
+
+
+
+
+
- TEMPLATE_VBOXGUESTR3EXE_EXTENDS  = VBOXR3EXE
- #TEMPLATE_VBOXGUESTR3EXE_TOOL   := $(subst GXX,GCC,$(TEMPLATE_VBOXR3EXE_TOOL))
@@ -2775 +2783 @@
-endif
-TEMPLATE_VBOXGUESTR3EXE_INST      = $(INST_ADDITIONS)
-
-
-
-
+
+
+
+
+
+
+
-                                    $(filter-out $(ARCH_BITS_DEFS),$(TEMPLATE_VBOXR3EXE_DEFS)) \
-
+
+
-if1of ($(KBUILD_TARGET),l4 linux) # As few libs as possible on linux.
- TEMPLATE_VBOXGUESTR3EXE_LIBS     = pthread rt m
@@ -2885 +2897 @@
-TEMPLATE_VBOXGUESTR0_SDKS.win.x86   = WIN32SDK W2K3DDKX86
-TEMPLATE_VBOXGUESTR0_SDKS.win.amd64 = W2K3DDK WINPSDKINCS
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-endif
-ifeq ($(KBUILD_TARGET),l4) # cross building linux on l4.
@@ -2915 +2931 @@
-VBOX_LIB_IPRT_GUEST_R3_MINI     = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Mini$(VBOX_SUFF_LIB)
-VBOX_LIB_IPRT_GUEST_R0          = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR0$(VBOX_SUFF_LIB)
+VBOX_LIB_IPRT_GUEST_R0_NT4      = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR0NT4$(VBOX_SUFF_LIB)
-VBOX_LIB_VBGL_R3                = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3Lib$(VBOX_SUFF_LIB)
-VBOX_LIB_VBGL_R3_XFREE86        = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibXFree86$(VBOX_SUFF_LIB)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -38 +38 @@
- # Only build the additions, sort out the legacy names first.
- #
-
+$(VBOX_WITH_64BIT_ADDITIONS)
-  LIBRARIES = RuntimeW32GuestR0 RuntimeW32GuestR3 RuntimeW32NT4GuestR0
- else
-  LIBRARIES = RuntimeGuestR0 RuntimeGuestR3 RuntimeGuestR3Mini
-OS2Warp3GuestR0
-#LIBRARIES.win = RuntimeW32NT4GuestR0
+GuestR0OS2Warp3
+LIBRARIES.win.x86 = RuntimeGuestR0NT4
-  ifndef VBOX_WITH_ADDITION_DRIVERS
-   if1of ($(KBUILD_TARGET), linux l4) # All drivers are optional, can skip RuntimeGuestR0.
@@ -65 +65 @@
- ifdef VBOX_WITH_ADDITIONS
-  ifdef VBOX_WITH_WIN32_ADDITIONS
-
+
+
+
-  endif
-
+$(VBOX_WITH_64BIT_ADDITIONS)
-   LIBRARIES += RuntimeGuestR0 RuntimeGuestR3 RuntimeGuestR3Mini
-OS2Warp3GuestR0
-#LIBRARIES.win = RuntimeW32NT4GuestR0
+GuestR0OS2Warp3
+LIBRARIES.win.x86 = RuntimeGuestR0NT4
-   ifndef VBOX_WITH_ADDITION_DRIVERS
-    if1of ($(KBUILD_TARGET), linux l4) # All drivers are optional, can skip RuntimeGuestR0.
@@ -545 +547 @@
-#
-RuntimeGuestR3_TEMPLATE                 := VBOXGUESTR3LIB
+## @todo change this to EXTEND the RuntimeR3 target.
-RuntimeGuestR3_SDKS.win                 := $(RuntimeR3_SDKS.win)
-RuntimeGuestR3_DEFS                     := $(filter-out RTCRITSECT_STRICT, $(RuntimeR3_DEFS))
@@ -565 +568 @@
-RuntimeGuestR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) := $(RuntimeR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
-RuntimeGuestR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH)   := $(RuntimeR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH))
+ifndef VBOX_WITH_64BIT_ADDITIONS
-RuntimeGuestR3_SOURCES.$(KBUILD_TARGET).x86 := $(RuntimeR3_SOURCES.$(KBUILD_TARGET).x86)
-RuntimeGuestR3_SOURCES.$(KBUILD_HOST).x86   := $(RuntimeR3_SOURCES.$(KBUILD_HOST).x86)
+endif
-
-
@@ -575 +580 @@
-#
-RuntimeGuestR3Mini_TEMPLATE                 := VBOXGUESTR3DLL
+## @todo change this to EXTEND the RuntimeGuestR3 target.
-RuntimeGuestR3Mini_INST                     := $(INST_ADDITIONS_LIB)
-RuntimeGuestR3Mini_SDKS.win                 := $(RuntimeR3_SDKS.win)
-RuntimeGuestR3Mini_DEFS                     := $(filter-out RTCRITSECT_STRICT, $(RuntimeR3_DEFS)) RT_MINI
- 
-
+
+   
-RuntimeGuestR3Mini_INCS                     := $(RuntimeR3_INCS)
- 
-
+
+   
-RuntimeGuestR3Mini_SOURCES = \
-        common/err/errmsg.cpp \
@@ -1157 +1163 @@
-#                  This is almost the same as the RuntimeR0Drv, the main difference
-#                  is in the backdoor logging and the lack of sup.h (which should be
-
-
-
+
-#
-RuntimeGuestR0_TEMPLATE                := VBOXGUESTR0LIB
-RuntimeGuestR0_SDKS.win                := W2K3DDKX86 WINPSDKINCS
-RuntimeGuestR0_DEFS                    := $(RuntimeR0Drv_DEFS)
-RuntimeGuestR0_DEFS.$(KBUILD_TARGET)    := $(RuntimeR0Drv_DEFS.$(KBUILD_TARGET))
-RuntimeGuestR0_INCS                    := $(PATH_SUB_CURRENT) include
-RuntimeGuestR0_INCS.$(KBUILD_TARGET)    := $(RuntimeR0Drv_INCS.$(KBUILD_TARGET))
-RuntimeGuestR0_SOURCES                 := $(filter-out generic/RTLogWriteUser-generic.cpp, $(RuntimeR0Drv_SOURCES))
-RuntimeGuestR0_SOURCES                 += VBox/logbackdoor.cpp
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-# HACK: no vbi for the solaris guest additions - yet.
@@ -1219 +1227 @@
-        r0drv/solaris/timer-r0drv-solaris.c
-
+#
+# RuntimeGuestR0NT4 - Win32 NT4 guest driver runtime.
+#
+RuntimeGuestR0NT4_EXTENDS = RuntimeGuestR0
+RuntimeGuestR0NT4_EXTENDS_BY = appending
+RuntimeGuestR0NT4_DEFS = IPRT_TARGET_NT4
+
+
+## @todo remove this
-RuntimeOS2GuestR0_TEMPLATE      = VBOXOS2GUESTR0LIB
-RuntimeOS2GuestR0_SOURCES       = \