Changeset 16341 in vbox

Timestamp:

Jan 28, 2009 9:12:18 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

42179

Message:

Makefiles: .darwin -> .darwin.x86.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Devices/Makefile.kmk (modified) (3 diffs)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)
• src/VBox/VMM/Makefile.kmk (modified) (4 diffs)

trunk/Config.kmk

@@ -2395 +2395 @@
 TEMPLATE_VBOXR3EXE_CXXFLAGS.darwin     = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS)
 TEMPLATE_VBOXR3EXE_OBJCFLAGS.darwin    = $(VBOX_DARWIN_DEF_SDK_OBJCFLAGS)
-TEMPLATE_VBOXR3EXE_LDFLAGS.darwin      = $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -read_only_relocs suppress
+TEMPLATE_VBOXR3EXE_LDFLAGS.darwin      = $(VBOX_DARWIN_DEF_SDK_LDFLAGS)
+TEMPLATE_VBOXR3EXE_LDFLAGS.darwin.x86  = $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -read_only_relocs suppress
  else if1of ($(KBUILD_TARGET),freebsd netbsd openbsd)
 TEMPLATE_VBOXR3EXE_TOOL                = GXX3

trunk/src/VBox/Devices/Makefile.kmk

@@ -249 +249 @@
 DevicesR3_TEMPLATE      = VBOXR3
 DevicesR3_SDKS.win      = WINPSDK W2K3DDK
-DevicesR3_DEFS.darwin   = VBOX_WITH_2X_4GB_ADDR_SPACE
+DevicesR3_DEFS.darwin.x86 = VBOX_WITH_2X_4GB_ADDR_SPACE
 DevicesR3_DEFS         += VBOX_HGCM_HOST_CODE \
                           $(if $(VBOX_WITH_VMI),VBOX_WITH_VMI,)
@@ -393 +393 @@
 VBoxDDGC_TEMPLATE       = VBOXGC
 VBoxDDGC_SYSSUFF        = .gc
-VBoxDDGC_DEFS.darwin    = VBOX_WITH_2X_4GB_ADDR_SPACE
+VBoxDDGC_DEFS.darwin.x86= VBOX_WITH_2X_4GB_ADDR_SPACE
 VBoxDDGC_DEFS           =
 VBoxDDGC_INCS          := \
@@ -469 +469 @@
 VBoxDDR0_TEMPLATE       = VBOXR0
 VBoxDDR0_SYSSUFF        = .r0
-VBoxDDR0_DEFS.darwin    = VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 VBOX_WITH_2X_4GB_ADDR_SPACE
+VBoxDDR0_DEFS.darwin.x86= VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 VBOX_WITH_2X_4GB_ADDR_SPACE
 VBoxDDR0_DEFS           = IN_RT_R0
 VBoxDDR0_INCS          := \

trunk/src/VBox/Main/Makefile.kmk

@@ -472 +472 @@
         $(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI,)
 endif
-VBoxC_DEFS.darwin = VBOX_WITH_2X_4GB_ADDR_SPACE
+VBoxC_DEFS.darwin.x86 = VBOX_WITH_2X_4GB_ADDR_SPACE
 VBoxC_DEFS.win.x86 += _WIN32_WINNT=0x0500
 VBoxC_DEFS.win.amd64 += _WIN32_WINNT=0x0510

trunk/src/VBox/VMM/Makefile.kmk

@@ -44 +44 @@
 VMMR3_DEFS     += VBOX_WITH_NEW_RECOMPILER
 endif
-VMMR3_DEFS.darwin     = VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3
-VMMR3_DEFS.darwin.x86 = VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_R3
+VMMR3_DEFS.darwin.x86 = \
+        VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3 \
+        VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_R3
 VMMR3_INCS     := \
         $(PATH_SUB_CURRENT) \
@@ -310 +311 @@
 VMMGC_DEFS     += VBOX_WITH_NEW_RECOMPILER
 endif
-VMMGC_DEFS.darwin     = VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_RC
-VMMGC_DEFS.darwin.x86 = VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_RC
+VMMGC_DEFS.darwin.x86 = \
+        VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_RC \
+        VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_RC
 VMMGC_SYSSUFF   = .gc
 VMMGC_LIBS      = \
@@ -410 +412 @@
 VMMR0_DEFS     += VBOX_WITH_NEW_RECOMPILER
 endif
-VMMR0_DEFS.darwin     = VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-VMMR0_DEFS.darwin.x86 = VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_R0
+VMMR0_DEFS.darwin.x86 = \
+        VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 \
+        VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_R0
 ifeq ($(VBOX_LDR_FMT),pe)
 VMMR0_LDFLAGS   = -Entry:VMMR0EntryEx
@@ -464 +467 @@
         VMMAll/VMAll.cpp \
         VMMAll/VMMAll.cpp
-VMMR0_SOURCES.darwin = \
+VMMR0_SOURCES.darwin.x86 = \
         VMMR0/PGMR0DynMap.cpp