VirtualBox

Changeset 6009

Show
Ignore:
Timestamp:
12/07/07 23:21:57 (1 year ago)
Author:
vboxsync
Message:

Added VBOX_WITHOUT_ADDITIONS for skipping the additions althogether.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/Config.kmk

    r6008 r6009  
    157157# Use additions from the build server. 
    158158#VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER = 1 
     159# Don't bother with additions. 
     160#VBOX_WITHOUT_ADDITIONS = 1 
    159161# Only build the additions (for the build server). 
    160162#VBOX_ONLY_ADDITIONS = 1 
  • trunk/src/VBox/Makefile.kmk

    r6004 r6009  
    4444 endif 
    4545 
    46  ifneq ($(VBOX_WITH_WIN32_ADDITIONS)$(VBOX_WITH_LINUX_ADDITIONS),) 
    47   SUBDIRS += Additions 
     46 ifndef VBOX_WITHOUT_ADDITIONS 
     47  ifneq ($(VBOX_WITH_WIN32_ADDITIONS)$(VBOX_WITH_LINUX_ADDITIONS),) 
     48   SUBDIRS += Additions 
     49  endif 
    4850 endif 
    4951 
  • trunk/src/VBox/Runtime/Makefile.kmk

    r6007 r6009  
    5555 
    5656 # 
    57  # Build everything
     57 # Normal build
    5858 # 
    5959 BLDPROGS   = uniread 
     
    6262  LIBRARIES += RuntimeR0Drv 
    6363 endif 
    64  ifdef VBOX_WITH_WIN32_ADDITIONS 
    65   LIBRARIES += RuntimeW32GuestR0   RuntimeW32GuestR3 RuntimeW32NT4GuestR0 
    66  endif 
    67  ifdef VBOX_WITH_LINUX_ADDITIONS 
    68   LIBRARIES += RuntimeLnx32GuestR3 
    69   ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0 
    70    LIBRARIES += RuntimeLnx32GuestR0 
     64 ifndef VBOX_WITHOUT_ADDITIONS 
     65  ifdef VBOX_WITH_WIN32_ADDITIONS 
     66   LIBRARIES += RuntimeW32GuestR0   RuntimeW32GuestR3 RuntimeW32NT4GuestR0 
    7167  endif 
    72  endif 
    73  ifdef VBOX_WITH_OS2_ADDITIONS 
    74   LIBRARIES += RuntimeOS2GuestR0 RuntimeOS2GuestR3 #RuntimeOS2Warp3GuestR0 
    75  endif 
    76  LIBRARIES.l4= RuntimeR3L4 
     68  ifdef VBOX_WITH_LINUX_ADDITIONS 
     69   LIBRARIES += RuntimeLnx32GuestR3 
     70   ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0 
     71    LIBRARIES += RuntimeLnx32GuestR0 
     72   endif 
     73  endif 
     74  ifdef VBOX_WITH_OS2_ADDITIONS 
     75   LIBRARIES += RuntimeOS2GuestR0 RuntimeOS2GuestR3 #RuntimeOS2Warp3GuestR0 
     76  endif 
     77 endif # !VBOX_WITHOUT_ADDITIONS 
     78 LIBRARIES.l4 = RuntimeR3L4 
    7779 DLLS = VBoxRT 
    7880 OTHER_CLEAN = \ 

© 2008 Sun Microsystems, Inc.
ContactPrivacy policy