- Timestamp:
- May 11, 2008 6:33:24 PM (17 years ago)
- svn:sync-xref-src-repo-rev:
- 30739
- Location:
- trunk
- Files:
-
- 16 edited
-
Config.kmk (modified) (8 diffs)
-
Makefile.kmk (modified) (1 diff)
-
src/Makefile.kmk (modified) (1 diff)
-
src/VBox/Additions/Makefile.kmk (modified) (5 diffs)
-
src/VBox/Additions/freebsd/Makefile.kmk (modified) (1 diff)
-
src/VBox/Additions/linux/Makefile.kmk (modified) (2 diffs)
-
src/VBox/Additions/solaris/Makefile.kmk (modified) (1 diff)
-
src/VBox/Devices/Graphics/BIOS/Makefile.kmk (modified) (1 diff)
-
src/VBox/Devices/PC/BIOS/Makefile.kmk (modified) (1 diff)
-
src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (2 diffs)
-
src/VBox/Frontends/VirtualBox4/Makefile.kmk (modified) (2 diffs)
-
src/VBox/Main/Makefile.kmk (modified) (1 diff)
-
src/VBox/Runtime/Makefile.kmk (modified) (1 diff)
-
src/VBox/VMM/testcase/Makefile.kmk (modified) (1 diff)
-
src/libs/xpcom18a4/Makefile.kmk (modified) (1 diff)
-
src/recompiler/Makefile.kmk (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r8758 r8759 222 222 #VBOX_WITH_VBOXFB = 1 223 223 # Enable the debugger. 224 ifneq ($( BUILD_TYPE),release)224 ifneq ($(KBUILD_TYPE),release) 225 225 VBOX_WITH_DEBUGGER = 1 226 226 # Enable the debugger GUI. … … 271 271 VBOX_WITH_INTEL_PXE = 1 272 272 # Strip binaries of release and profile builds 273 VBOX_DO_STRIP = $(if $(filter release profile,$( BUILD_TYPE)),1,)273 VBOX_DO_STRIP = $(if $(filter release profile,$(KBUILD_TYPE)),1,) 274 274 # Strip R0/GC modules (current requirement for our loader) 275 275 VBOX_DO_STRIP_MODULES = 1 … … 409 409 # 410 410 VBOX_BUILD_TYPES ?= release profile debug kprofile #todo: checked 411 ifn1of ($( BUILD_TYPE), $(VBOX_BUILD_TYPES))412 $(error Invalid BUILD_TYPE value '$( BUILD_TYPE)'. Choose one these: $(VBOX_BUILD_TYPES))411 ifn1of ($(KBUILD_TYPE), $(VBOX_BUILD_TYPES)) 412 $(error Invalid BUILD_TYPE value '$(KBUILD_TYPE)'. Choose one these: $(VBOX_BUILD_TYPES)) 413 413 endif 414 414 … … 726 726 727 727 # Produce debugging information that the Fiasco kernel debugger can read. 728 ifeq ($(KBUILD_TARGET).$( BUILD_TYPE),l4.debug)728 ifeq ($(KBUILD_TARGET).$(KBUILD_TYPE),l4.debug) 729 729 DEBUG_L4 = -gstabs+ 730 730 endif … … 779 779 # Compiler optimization flags. 780 780 # 781 ifeq ($( BUILD_TYPE),debug)781 ifeq ($(KBUILD_TYPE),debug) 782 782 VBOX_GCC_FP ?= -fno-omit-frame-pointer 783 783 VBOX_GCC_OPT ?= -O0 … … 894 894 895 895 # The kprofile build automagically links with kProfile. 896 ifeq ($( BUILD_TYPE),kprofile)896 ifeq ($(KBUILD_TYPE),kprofile) 897 897 LIB_RUNTIME += $(LIB_KPROFILE) 898 898 endif … … 2764 2764 TEMPLATE_VBOXGUESTR3XF86MOD = VBox Guest Program with C++ library dependencies 2765 2765 TEMPLATE_VBOXGUESTR3XF86MOD_EXTENDS = VBOXGUESTR3EXE 2766 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$( BUILD_TYPE) = $(NO_SUCH_VARIABLE)2766 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE) 2767 2767 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE) 2768 2768 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.linux = $(NO_SUCH_VARIABLE) 2769 2769 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE) 2770 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$( BUILD_TYPE) = $(NO_SUCH_VARIABLE)2770 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE) 2771 2771 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.linux = $(NO_SUCH_VARIABLE) 2772 2772 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS = -r … … 2790 2790 TEMPLATE_VBOXGUESTR3XORGMOD = VBox Guest Program with C++ library dependencies 2791 2791 TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS = VBOXGUESTR3DLL 2792 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$( BUILD_TYPE) = $(NO_SUCH_VARIABLE)2792 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE) 2793 2793 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE) 2794 2794 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.linux = $(NO_SUCH_VARIABLE) -
trunk/Makefile.kmk
r8758 r8759 542 542 additions-build-linux.x86 543 543 544 VBOX_ADDITIONS_BUILD = VBOX_ONLY_ADDITIONS=1 VBOX_WITHOUT_ADDITIONS_ISO=1 BUILD_TYPE=$( BUILD_TYPE) all packing544 VBOX_ADDITIONS_BUILD = VBOX_ONLY_ADDITIONS=1 VBOX_WITHOUT_ADDITIONS_ISO=1 BUILD_TYPE=$(KBUILD_TYPE) all packing 545 545 546 546 additions-build-win.x86: -
trunk/src/Makefile.kmk
r8155 r8759 30 30 ifdef VBOX_IPC_RELEASE_LOG 31 31 SUBDIRS = VBox/Runtime 32 else ifneq ($( BUILD_TYPE),release)32 else ifneq ($(KBUILD_TYPE),release) 33 33 SUBDIRS = VBox/Runtime 34 34 else -
trunk/src/VBox/Additions/Makefile.kmk
r8758 r8759 94 94 ifdef VBOX_WITH_ADDITIONS_ISO.win.x86 95 95 ifdef VBOX_ONLY_ADDITIONS 96 VBOX_PATH_ADDITIONS.win.x86 = $(PATH_OUT_BASE)/win.x86/$( BUILD_TYPE)/bin/additions96 VBOX_PATH_ADDITIONS.win.x86 = $(PATH_OUT_BASE)/win.x86/$(KBUILD_TYPE)/bin/additions 97 97 else 98 98 # 32-only hack … … 130 130 ifdef VBOX_WITH_ADDITIONS_ISO.os2.x86 131 131 ifdef VBOX_ONLY_ADDITIONS 132 VBOX_PATH_ADDITIONS.os2.x86 = $(PATH_OUT_BASE)/os2.x86/$( BUILD_TYPE)/bin/additions132 VBOX_PATH_ADDITIONS.os2.x86 = $(PATH_OUT_BASE)/os2.x86/$(KBUILD_TYPE)/bin/additions 133 133 else 134 134 VBOX_PATH_ADDITIONS.os2.x86 = $(VBOX_PATH_ADDITIONS) … … 156 156 ifdef VBOX_WITH_ADDITIONS_ISO.linux.x86 157 157 ifdef VBOX_ONLY_ADDITIONS 158 VBOX_PATH_ADDITIONS.linux.x86 = $(PATH_OUT_BASE)/linux.x86/$( BUILD_TYPE)/bin/additions158 VBOX_PATH_ADDITIONS.linux.x86 = $(PATH_OUT_BASE)/linux.x86/$(KBUILD_TYPE)/bin/additions 159 159 else 160 160 # 32-bit only hack … … 171 171 ifdef VBOX_WITH_ADDITIONS_ISO.solaris.x86 172 172 ifdef VBOX_ONLY_ADDITIONS 173 VBOX_PATH_ADDITIONS.solaris.x86 = $(PATH_OUT_BASE)/solaris.x86/$( BUILD_TYPE)/bin/additions173 VBOX_PATH_ADDITIONS.solaris.x86 = $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions 174 174 else 175 175 # 32-bit only hack … … 185 185 ifdef VBOX_WITH_ADDITIONS_ISO.freebsd.x86 186 186 ifdef VBOX_ONLY_ADDITIONS 187 VBOX_PATH_ADDITIONS.freebsd.x86 = $(PATH_OUT_BASE)/freebsd.x86/$( BUILD_TYPE)/bin/additions187 VBOX_PATH_ADDITIONS.freebsd.x86 = $(PATH_OUT_BASE)/freebsd.x86/$(KBUILD_TYPE)/bin/additions 188 188 else 189 189 # 32-bit only hack -
trunk/src/VBox/Additions/freebsd/Makefile.kmk
r8757 r8759 36 36 FREEBSDINSTDIR := $(PATH_TARGET)/install 37 37 38 ifeq ($( BUILD_TYPE),debug)38 ifeq ($(KBUILD_TYPE),debug) 39 39 BIN_COPY := $(CP) -f 40 40 BIN_COPY_SYMBOLS := $(CP) -f -
trunk/src/VBox/Additions/linux/Makefile.kmk
r8758 r8759 43 43 include $(PATH_KBUILD)/subfooter.kmk 44 44 45 ifeq ($( BUILD_TYPE),debug)45 ifeq ($(KBUILD_TYPE),debug) 46 46 BIN_COPY = $(CP) -f 47 47 BIN_COPY_SYMBOLS = $(CP) -f … … 107 107 | $(SED) "s;_BUILD_;$(shell date);g" \ 108 108 | $(SED) "s;_OSE_;$(VBOX_OSE);g" \ 109 | $(SED) "s;_BUILDTYPE_;$( BUILD_TYPE);g" \109 | $(SED) "s;_BUILDTYPE_;$(KBUILD_TYPE);g" \ 110 110 > $(PATH_TARGET)/install/install_.sh 111 111 $(QUIET)$(INSTALL) -m 0755 $(PATH_TARGET)/install/install_.sh $(PATH_TARGET)/install/install.sh -
trunk/src/VBox/Additions/solaris/Makefile.kmk
r8757 r8759 39 39 SOLARISTEMPDIR := $(PATH_TARGET)/tempinstall 40 40 41 ifeq ($( BUILD_TYPE),debug)41 ifeq ($(KBUILD_TYPE),debug) 42 42 BIN_COPY := $(CP) -f 43 43 BIN_COPY_SYMBOLS := $(CP) -f -
trunk/src/VBox/Devices/Graphics/BIOS/Makefile.kmk
r8732 r8759 80 80 $(PATH_TARGET)/_vgabios_.c: $(addprefix $(PATH_SUB_CURRENT)/,vgabios.c vgabios.h vbe.h vgatables.h vgafonts.h vbe.c clext.c) $(PATH_TARGET)/vbetables.h 81 81 $(call MSG_TOOL,cpp,VgaBiosBin,$<,$@) 82 $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -P -DVBOX -DVBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\" -DVBE -DVGABIOS_DATE="''" $(addprefix -D,$(DEFS) $(DEFS.$( BUILD_TYPE))) -o $@ $<82 $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -P -DVBOX -DVBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\" -DVBE -DVGABIOS_DATE="''" $(addprefix -D,$(DEFS) $(DEFS.$(KBUILD_TYPE))) -o $@ $< 83 83 84 84 # 3. compile - tempfile clashes, so make sure it's built in solitude. -
trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk
r8155 r8759 68 68 $(PATH_SUB_CURRENT)/../DevPcBios.h $(PATH_ROOT)/include/VBox/bioslogo.h | $(call DIRDEP,$(TARGET_PATH)) 69 69 $(call MSG_TOOL,cpp,PcBiosBin,$<,$@) 70 $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -I$(PATH_TARGET) -I$(VBOX_PATH_DEVICES_SRC)/PC -I$(PATH_ROOT)/include -I$(PATH_OUT) -DBX_SMP_PROCESSORS=1 -DVBOX -DVBOX_PC_BIOS $(addprefix -D,$(DEFS) $(DEFS.$( BUILD_TYPE))) -P -o $@ $<70 $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -I$(PATH_TARGET) -I$(VBOX_PATH_DEVICES_SRC)/PC -I$(PATH_ROOT)/include -I$(PATH_OUT) -DBX_SMP_PROCESSORS=1 -DVBOX -DVBOX_PC_BIOS $(addprefix -D,$(DEFS) $(DEFS.$(KBUILD_TYPE))) -P -o $@ $< 71 71 72 72 # 2. compile to intermediate asm file - tempfile clashes, make sure it's built alone. -
trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
r8758 r8759 336 336 VirtualBox_DEFS.darwin += VBOX_WITH_ICHAT_THEATER 337 337 endif 338 ifneq ($( BUILD_TYPE),release)338 ifneq ($(KBUILD_TYPE),release) 339 339 # non-release builds has some extra features. 340 340 VirtualBox_DEFS.win += VBOX_GUI_USE_DDRAW … … 370 370 371 371 372 ifeq ($( BUILD_TYPE),release)372 ifeq ($(KBUILD_TYPE),release) 373 373 VirtualBox_LDFLAGS.win += /SUBSYSTEM:windows 374 374 else -
trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk
r8758 r8759 574 574 VirtualBox_DEFS.darwin += VBOX_WITH_ICHAT_THEATER 575 575 endif 576 ifneq ($( BUILD_TYPE),release)576 ifneq ($(KBUILD_TYPE),release) 577 577 # non-release builds has some extra features. 578 578 VirtualBox_DEFS.win += VBOX_GUI_USE_DDRAW … … 608 608 609 609 610 ifeq ($( BUILD_TYPE),release)610 ifeq ($(KBUILD_TYPE),release) 611 611 VirtualBox_LDFLAGS.win += /SUBSYSTEM:windows 612 612 else -
trunk/src/VBox/Main/Makefile.kmk
r8758 r8759 249 249 250 250 VBoxSVC_LDFLAGS.darwin = -framework IOKit 251 ifeq ($( BUILD_TYPE),debug)251 ifeq ($(KBUILD_TYPE),debug) 252 252 VBoxSVC_LDFLAGS.linux += -rdynamic # for backtrace_symbols() 253 253 endif -
trunk/src/VBox/Runtime/Makefile.kmk
r8758 r8759 654 654 endif 655 655 VBoxRT_DEFS = $(RuntimeR3_DEFS) IN_SUP_R3 IN_SUP_R3 656 VBoxRT_DEFS.$( BUILD_TYPE) = $(RuntimeR3_DEFS.$(BUILD_TYPE))656 VBoxRT_DEFS.$(KBUILD_TYPE) = $(RuntimeR3_DEFS.$(KBUILD_TYPE)) 657 657 VBoxRT_SOURCES = \ 658 658 VBox/VBoxRTDeps.cpp \ -
trunk/src/VBox/VMM/testcase/Makefile.kmk
r8758 r8759 216 216 $(addprefix -D, \ 217 217 $(DEFS) \ 218 $(DEFS.$( BUILD_TYPE)) \218 $(DEFS.$(KBUILD_TYPE)) \ 219 219 $(DEFS.$(KBUILD_TARGET)) \ 220 220 IN_RING3 \ -
trunk/src/libs/xpcom18a4/Makefile.kmk
r8758 r8759 1142 1142 ifdef VBOX_IPC_RELEASE_LOG 1143 1143 IPC_LOGGING = 1 1144 else ifneq ($( BUILD_TYPE),release)1144 else ifneq ($(KBUILD_TYPE),release) 1145 1145 IPC_LOGGING = 1 1146 1146 endif -
trunk/src/recompiler/Makefile.kmk
r8758 r8759 357 357 -S -s \ 358 358 $(filter-out -g -O0, \ 359 $($(REM_MOD)_CFLAGS) $($(REM_MOD)_CFLAGS.$( BUILD_TYPE)) $($(REM_MOD)_CFLAGS.$(KBUILD_TARGET)) $($(REM_MOD)_CFLAGS.$(KBUILD_TARGET_ARCH)) $($(REM_MOD)_CFLAGS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \359 $($(REM_MOD)_CFLAGS) $($(REM_MOD)_CFLAGS.$(KBUILD_TYPE)) $($(REM_MOD)_CFLAGS.$(KBUILD_TARGET)) $($(REM_MOD)_CFLAGS.$(KBUILD_TARGET_ARCH)) $($(REM_MOD)_CFLAGS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \ 360 360 $(target-i386/op.c_CFLAGS) $(target-i386/op.c_CFLAGS.$(KBUILD_TARGET)) $(target-i386/op.c_CFLAGS.$(KBUILD_TARGET_ARCH)) $(target-i386/op.c_CFLAGS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \ 361 361 ) \ … … 365 365 ) \ 366 366 $(addprefix -D, \ 367 $($(REM_MOD)_CDEFS.$(KBUILD_TARGET_ARCH)) $($(REM_MOD)_CDEFS.$(KBUILD_TARGET)) $($(REM_MOD)_CDEFS) $(CDEFS.$(KBUILD_TARGET)) $(CDEFS.$(KBUILD_TARGET_ARCH)) $(CDEFS.$( BUILD_TYPE)) $(CDEFS) \368 $($(REM_MOD)_DEFS.$(KBUILD_TARGET_ARCH)) $($(REM_MOD)_DEFS.$(KBUILD_TARGET)) $($(REM_MOD)_DEFS) $(DEFS.$(KBUILD_TARGET)) $(DEFS.$(KBUILD_TARGET_ARCH)) $(DEFS.$( BUILD_TYPE)) $(DEFS) \367 $($(REM_MOD)_CDEFS.$(KBUILD_TARGET_ARCH)) $($(REM_MOD)_CDEFS.$(KBUILD_TARGET)) $($(REM_MOD)_CDEFS) $(CDEFS.$(KBUILD_TARGET)) $(CDEFS.$(KBUILD_TARGET_ARCH)) $(CDEFS.$(KBUILD_TYPE)) $(CDEFS) \ 368 $($(REM_MOD)_DEFS.$(KBUILD_TARGET_ARCH)) $($(REM_MOD)_DEFS.$(KBUILD_TARGET)) $($(REM_MOD)_DEFS) $(DEFS.$(KBUILD_TARGET)) $(DEFS.$(KBUILD_TARGET_ARCH)) $(DEFS.$(KBUILD_TYPE)) $(DEFS) \ 369 369 ) \ 370 370 -Wp,-MD,$(PATH_$(REM_MOD))/op.S.dep \
Note:
See TracChangeset
for help on using the changeset viewer.
