Changeset 6009 in vbox

Timestamp:

Dec 7, 2007 10:21:57 PM (17 years ago)

Author:

vboxsync

Message:

Added VBOX_WITHOUT_ADDITIONS for skipping the additions althogether.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -157 +157 @@
 # Use additions from the build server.
 #VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER = 1
+# Don't bother with additions.
+#VBOX_WITHOUT_ADDITIONS = 1
 # Only build the additions (for the build server).
 #VBOX_ONLY_ADDITIONS = 1

trunk/src/VBox/Makefile.kmk

@@ -44 +44 @@
  endif
 
- ifneq ($(VBOX_WITH_WIN32_ADDITIONS)$(VBOX_WITH_LINUX_ADDITIONS),)
-  SUBDIRS += Additions
+ ifndef VBOX_WITHOUT_ADDITIONS
+  ifneq ($(VBOX_WITH_WIN32_ADDITIONS)$(VBOX_WITH_LINUX_ADDITIONS),)
+   SUBDIRS += Additions
+  endif
  endif
 

trunk/src/VBox/Runtime/Makefile.kmk

@@ -55 +55 @@
 
  #
- # Build everything.
+ # Normal build.
  #
  BLDPROGS   = uniread
@@ -62 +62 @@
   LIBRARIES += RuntimeR0Drv
  endif
- ifdef VBOX_WITH_WIN32_ADDITIONS
-  LIBRARIES += RuntimeW32GuestR0   RuntimeW32GuestR3 RuntimeW32NT4GuestR0
- endif
- ifdef VBOX_WITH_LINUX_ADDITIONS
-  LIBRARIES += RuntimeLnx32GuestR3
-  ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
-   LIBRARIES += RuntimeLnx32GuestR0
+ ifndef VBOX_WITHOUT_ADDITIONS
+  ifdef VBOX_WITH_WIN32_ADDITIONS
+   LIBRARIES += RuntimeW32GuestR0   RuntimeW32GuestR3 RuntimeW32NT4GuestR0
   endif
- endif
- ifdef VBOX_WITH_OS2_ADDITIONS
-  LIBRARIES += RuntimeOS2GuestR0 RuntimeOS2GuestR3 #RuntimeOS2Warp3GuestR0
- endif
- LIBRARIES.l4= RuntimeR3L4
+  ifdef VBOX_WITH_LINUX_ADDITIONS
+   LIBRARIES += RuntimeLnx32GuestR3
+   ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
+    LIBRARIES += RuntimeLnx32GuestR0
+   endif
+  endif
+  ifdef VBOX_WITH_OS2_ADDITIONS
+   LIBRARIES += RuntimeOS2GuestR0 RuntimeOS2GuestR3 #RuntimeOS2Warp3GuestR0
+  endif
+ endif # !VBOX_WITHOUT_ADDITIONS
+ LIBRARIES.l4 = RuntimeR3L4
  DLLS = VBoxRT
  OTHER_CLEAN = \