Changeset 8758

Timestamp:

05/11/08 20:27:49 (5 months ago)

Author:

vboxsync

Message:

BUILD_TARGET* -> KBUILD_TARGET*.

Files:

• trunk/Config.kmk (modified) (103 diffs)
• trunk/Makefile.kmk (modified) (11 diffs)
• trunk/src/VBox/Additions/Makefile.kmk (modified) (2 diffs)
• trunk/src/VBox/Additions/common/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk (modified) (4 diffs)
• trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk (modified) (3 diffs)
• trunk/src/VBox/Additions/linux/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Additions/x11/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Additions/x11/xgraphics/Makefile.kmk (modified) (3 diffs)
• trunk/src/VBox/Additions/x11/xmouse/Makefile.kmk (modified) (2 diffs)
• trunk/src/VBox/Debugger/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Devices/Makefile.kmk (modified) (12 diffs)
• trunk/src/VBox/Devices/PC/Etherboot-src/Makefile.kmk (modified) (2 diffs)
• trunk/src/VBox/Devices/Storage/testcase/Makefile.kmk (modified) (3 diffs)
• trunk/src/VBox/Devices/testcase/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Disassembler/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Frontends/VBoxBFE/Makefile.kmk (modified) (5 diffs)
• trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk (modified) (4 diffs)
• trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (9 diffs)
• trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk (modified) (15 diffs)
• trunk/src/VBox/HostDrivers/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/HostDrivers/Support/Makefile.kmk (modified) (12 diffs)
• trunk/src/VBox/HostServices/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/HostServices/SharedClipboard/Makefile.kmk (modified) (2 diffs)
• trunk/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Installer/linux/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Installer/solaris/Makefile.kmk (modified) (3 diffs)
• trunk/src/VBox/Main/Makefile.kmk (modified) (15 diffs)
• trunk/src/VBox/Main/testcase/Makefile.kmk (modified) (2 diffs)
• trunk/src/VBox/Runtime/Makefile.kmk (modified) (21 diffs)
• trunk/src/VBox/VMM/testcase/Makefile.kmk (modified) (3 diffs)
• trunk/src/libs/Makefile.kmk (modified) (2 diffs)
• trunk/src/libs/ffmpeg-20060710/Makefile.kmk (modified) (2 diffs)
• trunk/src/libs/xpcom18a4/Makefile.kmk (modified) (14 diffs)
• trunk/src/recompiler/Makefile.kmk (modified) (16 diffs)
• trunk/tools/CommonFetch.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -38 +38 @@
-# Install paths.
-PATH_INS            := $(PATH_OUT)
-
+K
- INST_DIST            = dist/
- INST_SDK             = $(INST_DIST)sdk/
@@ -137 +137 @@
-# This indicates that additions (of some kind or another) is being _built_.
-# VBOX_WITHOUT_ADDITIONS overrides it.
-
+K
- VBOX_WITH_ADDITIONS = 1
-else ifdef VBOX_WITH_WIN32_ADDITIONS # for ssh cross builds -remove later!
@@ -148 +148 @@
-VBOX_WITH_ADDITION_DRIVERS = 1
-# Build win32 additions (cross building them on linux and l4 using wine).
-
+K
- VBOX_WITH_WIN32_ADDITIONS = 1
-endif
@@ -154 +154 @@
-# Note! VBOX_WITH_LINUX_ADDITIONS will be removed later and only
-# VBOX_WITH_WIN32_ADDITIONS will be kept around for cross building.
-
+K
- VBOX_WITH_LINUX_ADDITIONS = 1
-endif
@@ -162 +162 @@
-  VBOX_WITH_X11_ADDITIONS = 1
- endif
-
+K
-  VBOX_WITH_X11_ADDITIONS = 1
- endif
@@ -192 +192 @@
-# build enhanced version of rdesktop
-VBOX_WITH_VRDP_RDESKTOP = 1
-BUILD_TARGET).$(
+KBUILD_TARGET).$(K
-# build the support driver & library with IDT patching.
-VBOX_WITH_IDT_PATCHING = 1
@@ -201 +201 @@
-VBOX_WITH_VBOXDRV = 1
-# build with secure label support
-BUILD_TARGET).$(
+KBUILD_TARGET).$(K
-VBOX_WITH_SECURELABEL = 1
-endif
@@ -259 +259 @@
-# Enables the ffmpeg module for recording test runs.
-# Enable this for non-Linux builds later.
-
+K
-#  VBOX_WITH_FFMPEG = 1
-endif
@@ -275 +275 @@
-VBOX_DO_STRIP_MODULES = 1
-# Use kStuff for MACH-O and LX binary loading.
-
+K
-IPRT_WITH_KSTUFF = 1
-endif
@@ -292 +292 @@
-# Enable use of the $ORIGIN rpath feature. This is the default on
-# Solaris, but not else where for various reasons (ld.so, dist builds).
-
+K
- VBOX_WITH_ORIGIN = 1
-endif
@@ -316 +316 @@
-
-# l4 have to skip a few things.
-
+K
- VBOX_WITH_VBOXDRV=
- VBOX_WITH_ADDITION_DRIVERS=
@@ -331 +331 @@
-
-# Darwin have to skip a few things at present.
-
+K
- # Internal networking requires testing and possibly proper ring-3/ring0 separation.
- VBOX_WITH_INTERNAL_NETWORKING=
@@ -343 +343 @@
-
-# Most stuff doesn't build yet on the new targets.
-
+K
- VBOX_WITH_INSTALLER=
- VBOX_WITH_SECURELABEL=
@@ -355 +355 @@
-endif
-
-
+K
- VBOX_WITH_SECURELABEL=
- VBOX_WITH_VRDP_AUTHMOD=
@@ -363 +363 @@
-endif
-
-
+K
- VBOX_WITH_INSTALLER=
- VBOX_WITH_SECURELABEL=
@@ -433 +433 @@
- VBOX_WITH_TESTSUITE=
- VBOX_WITH_INTEL_PXE=
-
+K
-  # Qt/Mac v3.3.x requires patching to work for us.
-  VBOX_WITH_QTGUI=
- endif
-
+K
-  # Only the Linux, Solaris installers are public
-  VBOX_WITH_INSTALLER=
@@ -501 +501 @@
-# Image and object format config.
-#
-
+K
- VBOX_LDR_FMT = elf
-endif
-
+K
- VBOX_LDR_FMT = macho
-endif
-
+K
- VBOX_LDR_FMT = lx
- VBOX_LDR_FMT32 = lx
@@ -513 +513 @@
- DONT_USE_YASM = 1 # yasm doesn't implement omf yet.
-endif
-
+K
- VBOX_LDR_FMT = pe
-endif
@@ -526 +526 @@
-#
-ifeq ($(VBOX_LDR_FMT),elf)
-
+K
-VBOX_ASFLAGS_FMT = -f elf32 -DASM_FORMAT_ELF
- else
@@ -542 +542 @@
-endif
-ifeq ($(VBOX_LDR_FMT),pe)
-
+K
-VBOX_ASFLAGS_FMT = -f win32 -DASM_FORMAT_PE
- else
@@ -611 +611 @@
-#
-ifndef VBOX_GCC_TOOL
-
+K
-  VBOX_GCC_TOOL := MINGW32
-  TOOL_MINGW32_CFLAGS := $(UNDEFINED) # override -g
-
+K
-  VBOX_GCC_TOOL := GXX3OMF
-
+K
-  VBOX_GCC_TOOL := GXX4MACHO
-
+K
-  VBOX_GCC_TOOL := GXX3PLAIN
-  VBOX_GCC32_TOOL := GXX3PLAIN
- else
-  VBOX_GCC_TOOL := GXX3
-
+K
-   VBOX_GCC_TOOL := GXX32
-   VBOX_WITH_VBOXDRV=
-   VBOX_WITH_LINUX_ADDITIONS=
-   VBOX_WITH_WIN32_ADDITIONS=
-
+K
-   VBOX_GCC_TOOL := GXX64
-   VBOX_WITH_VBOXDRV=
@@ -637 +637 @@
-endif
-ifndef VBOX_GCC32_TOOL
-
+K
-  VBOX_GCC32_TOOL := $(VBOX_GCC_TOOL)
-
+K
-  VBOX_GCC32_TOOL := MINGW32
- else
@@ -650 +650 @@
-#
-ifndef VBOX_VCC_TOOL
-BUILD_TARGET).$(
+KBUILD_TARGET).$(K
-  VBOX_USE_VCC80 ?= 1 # Enforce VCC80 when targetting AMD64.
- endif
- ifdef VBOX_USE_VCC80
-
+K
-   VBOX_VCC_TOOL := VCC80X86
-  else
@@ -671 +671 @@
-PATH_DEVTOOLS := $(abspath $(PATH_DEVTOOLS))
-PATH_DEVTOOLS_BLD ?= $(PATH_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH)
-BUILD_TARGET).$(
+KBUILD_TARGET).$(K
-
-## @todo Remove the default tool crap here!
@@ -687 +687 @@
-#
-ifdef L4_DIR
-
+K
-  L4_API  ?= l4v2
-
+K
-  ifeq ($(L4_ARCH),x86)
-   L4_CPU ?= 586
@@ -726 +726 @@
-
-# Produce debugging information that the Fiasco kernel debugger can read.
-
+K
- DEBUG_L4 = -gstabs+
-endif
@@ -812 +812 @@
-# ARCH_BITS_DEFS.
-#
-
+K
- ARCH_BITS_DEFS := HC_ARCH_BITS=64 GC_ARCH_BITS=32
-
+K
- ARCH_BITS_DEFS := HC_ARCH_BITS=32 GC_ARCH_BITS=32
-else
-
+K
-endif
-
@@ -823 +823 @@
-# Add the output dir(s) to the dynamic loader search path.
-#
-
+K
- export LD_LIBRARY_PATH:=$(PATH_BIN):$(PATH_LIB):$(LD_LIBRARY_PATH)
-endif
-
+K
- #fixme! export BEGINLIBPATH:=$(PATH_BIN);$(PATH_LIB);$(BEGINLIBPATH)
-endif
-
+K
- export PATH:=$(PATH_BIN);$(PATH_LIB);$(PATH)
-endif
@@ -836 +836 @@
-# Common libraries and tools.
-#
-
+K
- LIB_RUNTIME     = $(PATH_BIN)/VBoxRT.dylib
- LIB_RUNTIME_EF  = #$(PATH_LIB)/RuntimeEFCPP.a
@@ -847 +847 @@
- LIB_SETTINGS    = $(PATH_BIN)/VBoxSettings.dylib
-endif
-
+K
- LIB_RUNTIME     = $(PATH_BIN)/VBoxRT.s.so
- LIB_RUNTIME_EF  = #$(PATH_LIB)/RuntimeEFCPP.a
@@ -858 +858 @@
- LIB_SETTINGS    = $(PATH_BIN)/VBoxSettings.s.so
-endif
-
+K
- LIB_RUNTIME     = $(PATH_BIN)/VBoxRT.so
- LIB_RUNTIME_EF  = $(PATH_LIB)/RuntimeEFCPP.a
@@ -869 +869 @@
- LIB_SETTINGS    = $(PATH_BIN)/VBoxSettings.so
-endif
-
+K
- LIB_RUNTIME     = $(PATH_BIN)/VBoxRT.dll
- LIB_RUNTIME_EF  = #$(PATH_LIB)/RuntimeEFCPP.a
@@ -881 +881 @@
- OBJ_SYS0        = $(PATH_OBJ)/src/VBox/Runtime/RuntimeR0/os2/sys0.obj
-endif
-
+K
- LIB_RUNTIME     = $(PATH_LIB)/VBoxRT.lib
- LIB_RUNTIME_EF  = #$(PATH_LIB)/RuntimeEFCPP.lib
@@ -910 +910 @@
-endif
-ifeq ($(VBOX_XCURSOR_LIBS),)
-
+K
-  VBOX_XCURSOR_LIBS := $(lastword $(wildcard $(PATH_DEVTOOLS_TRG)/libXcursor/*/lib/libXcursor.a))
-  ifneq ($(VBOX_XCURSOR_LIBS),)
@@ -966 +966 @@
-# Windows install tools...
-VBOX_PATH_WIX  ?= $(PATH_DEVTOOLS)/win.x86/wix/v2.0.4611.0
-
+K
-
-# We need to export YASM for OSE, but since it was converted to .zip we need to
@@ -975 +975 @@
-
-# XPCOM setup for all but win32.
-
+K
- VBOX_WITH_XPCOM      = 1
- VBOX_XPIDL          ?= $(VBOX_PATH_SDK)/bin/xpidl$(HOSTSUFF_EXE)
@@ -986 +986 @@
-        $(VBOX_PATH_SDK)/include/xpcom/xpcom \
-        $(VBOX_PATH_SDK)/include/xpcom/ipcd
-
+K
-  # libIDL-config (for xpcom18a4)
-  ifeq ($(origin VBOX_LIBIDL_CONFIG),undefined)
@@ -994 +994 @@
-endif
-
-
+K
- # search DLLs in the EXE directory first
- VBOX_XPIDL    := BEGINLIBPATH="$(dir $(VBOX_XPIDL));$$BEGINLIBPATH" $(VBOX_XPIDL)
@@ -1001 +1001 @@
-
-# The X11 LIBPATH. (The amd64 hack is for RHEL4.)
-
+K
- VBOX_LIBPATH_X11 ?= /usr/X11R6/lib64 /usr/X11R6/lib
-else
@@ -1046 +1046 @@
-#       VBOX_GCC_RPATH_OPT - Different GCC/LD combinations needs different options.
-VBOX_ORIGIN = $$ORIGIN
-
+K
- VBOX_GCC_RPATH_OPT = -R
-else
@@ -1139 +1139 @@
-        $(APPEND) '$@' 'VBOX_GCC_mtune-generic         ?= $(call VBOX_GCC_CHECK_CC,-mtune=generic,)'
-        $(APPEND) '$@' 'VBOX_LD_as_needed              ?= $(call VBOX_GCC_CHECK_LD,--as-needed,)'
-
+K
-# Set default attribute for ELF and MACH-O symbols to ``hidden'' to reduce the number
-# of relocation entries and PLT indirections in shared libraries. Don't allow for gcc version < 4.
@@ -1148 +1148 @@
-        $(APPEND) '$@' 'endif'
-endif
-
+K
-# Set default attribute for inline functions to ``hidden'' to reduce the number
-# of relocation entries and PLT indirections in shared libraries. Don't allow for gcc version < 4.
@@ -1227 +1227 @@
-  VBOX_MAKE_CAT64_FN   ?= $(call VBOX_MAKE_CAT_HLP_FN,$(1),$(2),XP_X64;Server2003_X64;Vista_X64)
-  VBOX_MAKE_CAT32_FN   ?= $(call VBOX_MAKE_CAT_HLP_FN,$(1),$(2),2000;XP_X86;Server2003_X86;Vista_X86)
-
+K
-   VBOX_MAKE_CAT_FN    ?= $(call VBOX_MAKE_CAT32_FN,$(1),$(2))
-  else
@@ -1249 +1249 @@
-# Windows .inf editing.
-#
-
+K
- VBOX_EDIT_INF_FN = $(call VBOX_EDIT_INF32_FN,$(1),$(2))
-else
@@ -1267 +1267 @@
-#
-VBOX_PREF_LIB =
-
+K
-VBOX_SUFF_LIB = .lib
-else
@@ -1273 +1273 @@
-endif
-VBOX_SUFF_DLL = $(SUFF_DLL)
-
+K
-VBOX_SUFF_OBJ = .o
-else
@@ -1285 +1285 @@
-#
-SDK_VBOX_LIBXML2          = .
-
+K
- SDK_VBOX_LIBXML2_INCS   ?= $(PATH_ROOT)/src/libs/libxml2-2.6.30/include
- SDK_VBOX_LIBXML2_LIBS   ?= $(PATH_LIB)/VBox-libxml2$(VBOX_SUFF_LIB)
- SDK_VBOX_LIBXML2_DEFS   ?= LIBXML_STATIC
- SDK_VBOX_LIBXML2_DEFS.win += WIN32 _WINDOWS _MBCS
-
+K
-# SDK_VBOX_LIBXML2_INCS      ?=
-# SDK_VBOX_LIBXML2_LIBS      ?=
@@ -1302 +1302 @@
-
-SDK_VBOX_LIBXSLT          = .
-
+K
- SDK_VBOX_LIBXSLT_INCS   ?= $(PATH_ROOT)/src/libs/libxslt-1.1.22
- SDK_VBOX_LIBXSLT_LIBS   ?= $(PATH_LIB)/VBox-libxslt$(VBOX_SUFF_LIB)
- SDK_VBOX_LIBXSLT_DEFS   ?=
- SDK_VBOX_LIBXSLT_DEFS.win += WIN32 _WINDOWS _MBCS _REENTRANT
-
+K
-# SDK_VBOX_LIBXSLT_INCS      ?=
-# SDK_VBOX_LIBXSLT_LIBS      ?=
@@ -1323 +1323 @@
-
-SDK_VBOX_ZLIB         = .
-
+K
- SDK_VBOX_ZLIB_INCS  ?= $(PATH_ROOT)/src/libs/zlib-1.2.1
- SDK_VBOX_ZLIB_LIBS  ?= $(PATH_LIB)/VBox-zlib$(VBOX_SUFF_LIB)
@@ -1336 +1336 @@
-
-SDK_VBOX_FFMPEG       = .
-
+K
- SDK_VBOX_FFMPEG_INCS ?= \
-        $(PATH_ROOT)/src/libs/ffmpeg-20060710/libavutil \
-        $(PATH_ROOT)/src/libs/ffmpeg-20060710/libavcodec \
-        $(PATH_ROOT)/src/libs/ffmpeg-20060710/libavformat
-
+K
-  ## @todo Michael! Where is $(PATH_LIB)/VBoxFFmpegImp$(VBOX_SUFF_LIB) supposed to come from?
-  #SDK_VBOX_FFMPEG_LIBS ?= $(PATH_LIB)/VBoxFFmpeg.a
@@ -1365 +1365 @@
-#
-## @todo convert this into SDK and integrate the Qt stuff into kBuild.
-
+K
- VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v3.*)))
- VBOX_DLL_QT ?= $(firstword $(wildcard $(VBOX_PATH_QT)/bin/VBoxQt3*.dll) \
@@ -1384 +1384 @@
-                           $(wildcard $(VBOX_PATH_QT)/lib/dynamic/qtmain.lib))
- QTDIR ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_BLD)/qt/v3.*)))
-
+K
- QTDIR ?= $(PATH_DEVTOOLS_TRG)/qt/v3.3.1
- VBOX_PATH_QT ?= $(QTDIR)
@@ -1391 +1391 @@
- LIB_QT_PRL ?= $(lastword $(sort $(wildcard $(VBOX_PATH_QT)/lib/*qt*.prl)))
- QTDIR := $(VBOX_PATH_QT)
-
+K
- ifndef VBOX_PATH_QT
-  VBOX_PATH_QT := $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v3.*)))
@@ -1435 +1435 @@
- LIB_QT ?= qt-mt
-endif
-
+K
- VBOX_PATH_QT_HOST ?= $(VBOX_PATH_QT)
-else
@@ -1445 +1445 @@
-VBOX_LRELEASE ?= $(VBOX_PATH_QT_HOST)/bin/lrelease$(HOSTSUFF_EXE)
-
-
+K
- # search DLLs in the EXE directory first (unless VBOX_DLL_QT is set)
- VBOX_DLL_QT_PATH := $(dir $(VBOX_DLL_QT))
@@ -1458 +1458 @@
-# The linux kernel headers(/sources).
-#
-
+K
- ifeq ($(origin VBOX_LINUX_SRC),undefined)
-  ifneq ($(wildcard /lib/modules/$(shell uname -r)/build/include/linux/autoconf.h),)
@@ -1477 +1477 @@
-    kernelpath := $(VBOX_LINUX_SRC)
-   endif
-
+K
-     VBOX_LINUX_INCS                += $(kernelpath)/include/asm-i386/mach-default \
-                                       $(kernelpath)/include/asm-x86/mach-default
@@ -1520 +1520 @@
-TEMPLATE_VBOXGC_CXXFLAGS            = -g -Wall -pedantic -Wno-long-long -Wno-trigraphs $(VBOX_GCC32_Wno-variadic-macros) -pipe -fno-exceptions -fno-rtti $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden)
-TEMPLATE_VBOXGC_CFLAGS              = -g -Wall -pedantic -Wno-long-long -Wno-trigraphs $(VBOX_GCC32_Wno-variadic-macros) -pipe -Wmissing-prototypes -Wstrict-prototypes $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden)
-
+K
- TEMPLATE_VBOXGC_LDFLAGS            = -r
-else
@@ -1528 +1528 @@
- TEMPLATE_VBOXGC_LDFLAGS.release    = $(if $(VBOX_DO_STRIP_MODULES),-S,)
-endif
-
+K
- TEMPLATE_VBOXGC_LIBS               = \
-        $(VBOX_GCC32_LIBGCC) # instricts
@@ -1623 +1623 @@
-TEMPLATE_VBOXR0_CFLAGS.amd64        = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding
-TEMPLATE_VBOXR0_CXXFLAGS.amd64      = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables
-
+K
- TEMPLATE_VBOXR0_LDFLAGS             = -r
-else
@@ -1631 +1631 @@
- TEMPLATE_VBOXR0_LDFLAGS.release     = $(if $(VBOX_DO_STRIP_MODULES),-S,)
-endif
-
+K
- TEMPLATE_VBOXR0_LIBS                = \
-        $(VBOX_GCC_LIBGCC) # instricts
@@ -1665 +1665 @@
-TEMPLATE_VBOXR0DRV_DEFS                = IN_RING0 IN_RT_R0 $(ARCH_BITS_DEFS)
-
-
+K
- TEMPLATE_VBOXR0DRV_TOOL               = $(VBOX_VCC_TOOL)
- TEMPLATE_VBOXR0DRV_RCDEFS             = \
@@ -1688 +1688 @@
-endif
-
-
+K
-TEMPLATE_VBOXR0DRV_TOOL                = $(VBOX_GCC_TOOL)
-TEMPLATE_VBOXR0DRV_DEFS                = __KERNEL__ MODULE IN_RING0 IN_RT_R0
@@ -1699 +1699 @@
-        -fno-reorder-blocks -ffreestanding -fno-asynchronous-unwind-tables -funit-at-a-time \
-        -Wno-sign-compare -Wdeclaration-after-statement
-
+K
-  ifndef VBOX_LINUX_VERSION_2_4
-# 2.6
@@ -1712 +1712 @@
-endif
-
-
+K
-TEMPLATE_VBOXR0DRV_TOOL                = GXX3OMF
-TEMPLATE_VBOXR0DRV_CXXFLAGS            = -g -Wall -pedantic -Wno-long-long -Wno-trigraphs $(VBOX_GCC_Wno-variadic-macros) -pipe $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing -fno-rtti -fno-exceptions
@@ -1721 +1721 @@
-endif
-
-
+K
-TEMPLATE_VBOXR0DRV_TOOL                = GXX4MACHO
-TEMPLATE_VBOXR0DRV_DEFS               += KERNEL KERNEL_PRIVATE DRIVER_PRIVATE APPLE NeXT
@@ -1746 +1746 @@
-endif
-
-
+K
-## The Solaris /usr/platform/i86pc/include and /usr/include directories.
-VBOX_SOLARIS_SYS_INCS ?= /usr/platform/i86pc/include /usr/include
@@ -1768 +1768 @@
-endif # Solaris
-
-
+K
-# x86 FreeBSD:
-#  cc -O2 -fno-strict-aliasing -pipe -Werror -D_KERNEL -DKLD_MODULE \
@@ -1851 +1851 @@
-TEMPLATE_VBOXR3EXE_DEFS                = IN_RING3 $(ARCH_BITS_DEFS)
-TEMPLATE_VBOXR3EXE_LIBS.kprofile       = $(LIB_KPROFILE)
-
+K
- TEMPLATE_VBOXR3EXE_TOOL               = $(VBOX_VCC_TOOL)
- TEMPLATE_VBOXR3EXE_RCDEFS             = \
@@ -1914 +1914 @@
-        -Wl,--rpath-link,$(L4_LIBDIR)
-TEMPLATE_VBOXR3EXE_LDFLAGS.linux       = -Wl,-z,noexecstack $(VBOX_LD_as_needed)
-
+K
-TEMPLATE_VBOXR3EXE_LIBS                = pthread m rt dl
-
+K
-TEMPLATE_VBOXR3EXE_LIBS                = \
-        $(L4_LIBDIR)/libvboxserver.s.so \
@@ -1923 +1923 @@
-        $(L4_LIBDIR)/libdl.s.so \
-        $(L4_LIBDIR)/libuc.0.s.so
-
+K
-TEMPLATE_VBOXR3EXE_TOOL                = GXX3OMF
-TEMPLATE_VBOXR3EXE_LIBS                = socket iconv
-
+K
-TEMPLATE_VBOXR3EXE_TOOL                = GXX4MACHO
-TEMPLATE_VBOXR3EXE_LIBS                =
-TEMPLATE_VBOXR3EXE_LDFLAGS             = -read_only_relocs suppress
-
+K
-TEMPLATE_VBOXR3EXE_TOOL                = GXX3
-TEMPLATE_VBOXR3EXE_LIBS                = pthread
@@ -1937 +1937 @@
-        /usr/X11R6/include \
-        /usr/local/include
-
+K
-TEMPLATE_VBOXR3EXE_TOOL                = GXX3PLAIN
-TEMPLATE_VBOXR3EXE_DEFS               += LIBICONV_PLUG _REENTRANT # Avoid the GNU libiconv, for now at least.
-TEMPLATE_VBOXR3EXE_LIBS                = rt socket
- else
-
+K
-TEMPLATE_VBOXR3EXE_CXXFLAGS.profile    = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.release)
-TEMPLATE_VBOXR3EXE_CXXFLAGS.kprofile   = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.krelease)
@@ -1960 +1960 @@
-TEMPLATE_VBOXR3_DEFS.l4     = $(TEMPLATE_VBOXR3EXE_DEFS.l4) __PIC__
-TEMPLATE_VBOXR3_DEFS.darwin = $(TEMPLATE_VBOXR3EXE_DEFS.darwin) PIC
-BUILD_TARGET).$(
-
+KBUILD_TARGET).$(K
+K
-  TEMPLATE_VBOXR3_DEFS = $(TEMPLATE_VBOXR3EXE_DEFS) PIC
-  TEMPLATE_VBOXR3_CFLAGS = $(TEMPLATE_VBOXR3EXE_CFLAGS) -fPIC
@@ -1980 +1980 @@
- TEMPLATE_VBOXR3TSTEXE_LDFLAGS= '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)/..' $(TEMPLATE_VBOXR3EXE_LDFLAGS)
-endif
-
+K
- ifdef VBOX_SIGNING_MODE
-  TEMPLATE_VBOXR3TSTEXE_POST_CMDS =
@@ -2002 +2002 @@
-TEMPLATE_VBOXR3NPEXE                     = VBox Ring 3 Non-pedantic
-TEMPLATE_VBOXR3NPEXE_EXTENDS             = VBOXR3EXE
-
+K
- TEMPLATE_VBOXR3NPEXE_TOOL                = $(VBOX_GCC_TOOL)
- TEMPLATE_VBOXR3NPEXE_CXXFLAGS            = $(filter-out -pedantic,$(TEMPLATE_VBOXR3EXE_CXXFLAGS))
@@ -2020 +2020 @@
-        -nostdlib
-TEMPLATE_VBOXR3NP_DEFS.l4 = $(TEMPLATE_VBOXR3NPEXE_DEFS.l4) __PIC__
-BUILD_TARGET).$(
-
+KBUILD_TARGET).$(K
+K
-  TEMPLATE_VBOXR3NP_DEFS = $(TEMPLATE_VBOXR3NPEXE_DEFS) PIC
-  TEMPLATE_VBOXR3NP_CFLAGS = $(TEMPLATE_VBOXR3NPEXE_CFLAGS) -fPIC
@@ -2049 +2049 @@
-endif
-TEMPLATE_VBOXNOCRTGCC_CXXFLAGS          = $(TEMPLATE_VBOXNOCRTGCC_CFLAGS)
-BUILD_TARGET) = $(TEMPLATE_VBOXNOCRTGCC_CFLAGS.$(
-BUILD_TARGET_ARCH) = $(TEMPLATE_VBOXNOCRTGCC_CFLAGS.$(
+KBUILD_TARGET) = $(TEMPLATE_VBOXNOCRTGCC_CFLAGS.$(K
+KBUILD_TARGET_ARCH) = $(TEMPLATE_VBOXNOCRTGCC_CFLAGS.$(K
-TEMPLATE_VBOXNOCRTGCC_INCS              = $(PATH_ROOT)/include/iprt/nocrt
-
-BUILD_TARGET).$(
+KBUILD_TARGET).$(K
- # cross compile to 64-bit ELF (linux).
- TEMPLATE_VBOXNOCRTGCC_TOOL             = XGCCAMD64LINUX
@@ -2061 +2061 @@
- TEMPLATE_VBOXNOCRTGCC_LDFLAGS          = -nostdlib
-
-BUILD_TARGET).$(
+KBUILD_TARGET).$(K
- # Use the default GCC (MinGW) with the Microsoft linker.
- # (Drop all '-g' options as we're unable to strip the debug info.)
@@ -2080 +2080 @@
- TEMPLATE_VBOXNOCRTGCC_CFLAGS          += $(VBOX_GCC_fno-stack-protector)
- TEMPLATE_VBOXNOCRTGCC_CXXFLAGS        += $(VBOX_GCC_fno-stack-protector)
-
+K
-  # in 64-bit mode we'll build a sys-module (VBoxREM2).
-
+K
-   TEMPLATE_VBOXNOCRTGCC_LDFLAGS.solaris= -64 -r
-  else
@@ -2089 +2089 @@
- else # x86:
-  TEMPLATE_VBOXNOCRTGCC_LDFLAGS         = -nostdlib
-
+K
-   TEMPLATE_VBOXNOCRTGCC_LDFLAGS       += -Wl,--no-undefined
-  endif
@@ -2103 +2103 @@
-TEMPLATE_VBOXNOCRTGAS_EXTENDS = VBOXNOCRTGCC
-TEMPLATE_VBOXNOCRTGAS_ASTOOL = $(TEMPLATE_VBOXNOCRTGCC_TOOL)
-BUILD_TARGET).$(
+KBUILD_TARGET).$(K
- TEMPLATE_VBOXNOCRTGAS_ASFLAGS = -s
-else
@@ -2126 +2126 @@
-        $(VBOX_PATH_SDK)/include
-
-
+K
-  TEMPLATE_VBOXMAINEXE_SDKS              = WINPSDK W2K3DDK
- ifdef VBOX_USE_VCC80
@@ -2172 +2172 @@
-TEMPLATE_VBOXMAINEXE_LDFLAGS.x86         = -m32
-TEMPLATE_VBOXMAINEXE_LDFLAGS.amd64       = -m64
-
+K
-TEMPLATE_VBOXMAINEXE_LIBS                = pthread m rt $(LIB_RUNTIME)
-TEMPLATE_VBOXMAINEXE_LDFLAGS.linux       = $(VBOX_LD_as_needed)
-
+K
-TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME)
-# no libs as yet in l4 target - must be added later
-
+K
-TEMPLATE_VBOXMAINEXE_TOOL                = GXX3OMF
-TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME)
-
+K
-TEMPLATE_VBOXMAINEXE_TOOL                = GXX4MACHO
-TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME)
-TEMPLATE_VBOXMAINEXE_LDFLAGS.darwin      = -bind_at_load -framework Carbon
-
+K
-TEMPLATE_VBOXMAINEXE_TOOL                = GXX3
-TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME)
-
+K
-TEMPLATE_VBOXMAINEXE_TOOL                = GXX3PLAIN
-TEMPLATE_VBOXMAINEXE_DEFS               += _REENTRANT
-TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME) rt
- else
-
+K
-TEMPLATE_VBOXMAINEXE_LIBS                =
- endif
@@ -2223 +2223 @@
-TEMPLATE_VBOXMAINDLL  = VBox Main Component (shared library)
-TEMPLATE_VBOXMAINDLL_EXTENDS = VBOXMAINEXE
-BUILD_TARGET).$(
-
+KBUILD_TARGET).$(K
+K
-  TEMPLATE_VBOXMAINDLL_DEFS     = PIC $(TEMPLATE_VBOXMAINEXE_DEFS)
-  TEMPLATE_VBOXMAINDLL_CFLAGS   = -fPIC $(TEMPLATE_VBOXMAINEXE_CFLAGS)
@@ -2247 +2247 @@
-TEMPLATE_VBOXMAINCLIENTEXE             = VBox Main Client (executable)
-TEMPLATE_VBOXMAINCLIENTEXE_EXTENDS     = VBOXMAINEXE
-
+K
- TEMPLATE_VBOXMAINCLIENTEXE_LIBS.win   = $(TEMPLATE_VBOXMAINEXE_LIBS.win) \
-   $(PATH_SDK_WINPSDK_LIB)/User32.Lib \
@@ -2271 +2271 @@
-TEMPLATE_VBOXMAINCLIENTDLL              = VBox MAIN Client (shared library)
-TEMPLATE_VBOXMAINCLIENTDLL_EXTENDS      = VBOXMAINCLIENTEXE
-BUILD_TARGET).$(
-
+KBUILD_TARGET).$(K
+K
-  TEMPLATE_VBOXMAINCLIENTDLL_DEFS       = PIC $(TEMPLATE_VBOXMAINCLIENTEXE_DEFS)
-  TEMPLATE_VBOXMAINCLIENTDLL_CFLAGS     = -fPIC $(TEMPLATE_VBOXMAINCLIENTEXE_CFLAGS)
@@ -2291 +2291 @@
-        $(VBOX_PATH_QT)/include
-
-
+K
- # drag in library configuration (we need QMAKE_PRL_DEFINES)
- ifneq ($(LIB_QT_PRL),)
@@ -2351 +2351 @@
-        $(LIB_VMM)
-
-
+K
-  TEMPLATE_VBOXQTGUIEXE_LIBPATH = \
-        $(VBOX_PATH_QT)/lib64 $(VBOX_PATH_QT)/lib
@@ -2359 +2359 @@
- endif
-
-
+K
-  TEMPLATE_VBOXQTGUIEXE_LDFLAGS += $(VBOX_LD_as_needed)
-
+K
-  TEMPLATE_VBOXQTGUIEXE_LDFLAGS += -framework Carbon -framework QuickTime -bind_at_load
-  TEMPLATE_VBOXQTGUIEXE_LIBS +=
-  TEMPLATE_VBOXQTGUIEXE_LIBPATH +=
-
+K
-  # drag in library configuration (we need QMAKE_PRL_DEFINES)
-  ifneq ($(LIB_QT_PRL),)
@@ -2384 +2384 @@
-  TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
-        $(VBOX_LIBPATH_X11)
-
+K
-   TEMPLATE_VBOXQTGUIEXE_INCS += \
-        /usr/include \
@@ -2390 +2390 @@
-        /usr/local/include
-  endif
-
+K
-   TEMPLATE_VBOXQTGUIEXE_LIBS += \
-        rt socket nsl
@@ -2396 +2396 @@
- endif
- ifdef VBOX_WITH_ORIGIN
-
+K
-   TEMPLATE_VBOXQTGUIEXE_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN):$$(VBOX_ORIGIN)/qtgcc/lib'
-  else
@@ -2423 +2423 @@
-TEMPLATE_VBOXQTGUI_EXTENDS = VBOXQTGUIEXE
-TEMPLATE_VBOXQTGUI_LIBS = $(filter-out $(QTMAIN),$(TEMPLATE_VBOXQTGUIEXE_LIBS))
-
+K
- TEMPLATE_VBOXQTGUI_LDFLAGS = $(filter-out -framework Carbon -framework QuickTime -bind_at_load,$(TEMPLATE_VBOXQTGUIEXE_LDFLAGS))
-endif
-BUILD_TARGET).$(
-
+KBUILD_TARGET).$(K
+K
-  TEMPLATE_VBOXQTGUI_DEFS     = PIC $(TEMPLATE_VBOXQTGUIEXE_DEFS)
-  TEMPLATE_VBOXQTGUI_CFLAGS   = -fPIC $(TEMPLATE_VBOXQTGUIEXE_CFLAGS)
@@ -2708 +2708 @@
-#
-TEMPLATE_VBOXGUESTR3EXE           = VBox Guest Program
-
+K
- TEMPLATE_VBOXGUESTR3EXE_EXTENDS  = VBOXW32GUESTR3
-else
@@ -2723 +2723 @@
-                                    $(filter-out $(ARCH_BITS_DEFS),$(TEMPLATE_VBOXR3EXE_DEFS)) \
-                                    HC_ARCH_BITS=32 GC_ARCH_BITS=32
-
+K
- TEMPLATE_VBOXGUESTR3EXE_LIBS     = pthread rt m
-endif
-
+K
- TEMPLATE_VBOXGUESTR3EXE_BLD_TRG  = linux
- TEMPLATE_VBOXGUESTR3EXE_DLLSUFF  = .so
@@ -2738 +2738 @@
-TEMPLATE_VBOXGUESTR3DLL_EXTENDS  = VBOXGUESTR3EXE
-## @todo add a INSTFUN that separates dlls and libs.
-
+K
- TEMPLATE_VBOXGUESTR3DLL_DEFS       = $(TEMPLATE_VBOXGUESTR3EXE_DEFS) PIC
- TEMPLATE_VBOXGUESTR3DLL_CFLAGS     = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fPIC
@@ -2751 +2751 @@
-TEMPLATE_VBOXGUESTR3LIB_EXTENDS = VBOXGUESTR3EXE
-TEMPLATE_VBOXGUESTR3LIB_INST    = $(INST_ADDITIONS_LIB)
-
+K
- TEMPLATE_VBOXGUESTR3LIB_DEFS       = $(TEMPLATE_VBOXGUESTR3EXE_DEFS) PIC
- TEMPLATE_VBOXGUESTR3LIB_CFLAGS     = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fPIC
@@ -2765 +2765 @@
-TEMPLATE_VBOXGUESTR3XF86MOD_EXTENDS = VBOXGUESTR3EXE
-TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(BUILD_TYPE)      = $(NO_SUCH_VARIABLE)
-
+K
-TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.linux              = $(NO_SUCH_VARIABLE)
-
+K
-TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(BUILD_TYPE)   = $(NO_SUCH_VARIABLE)
-TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.linux           = $(NO_SUCH_VARIABLE)
-TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS                 = -r
-
+K
- TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.release = -S
- TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.x86     = -m elf_i386
@@ -2791 +2791 @@
-TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS = VBOXGUESTR3DLL