vbox的更動 30799 路徑 trunk/src/VBox/VMM/Makefile.kmk

時間撮記:

2010-7-13 上午08:16:37 (14 年 以前)

作者:

vboxsync

訊息:

TM: Made it possible to enable the resettable accounting stats in release builds (from the makefile).

檔案:

• trunk/src/VBox/VMM/Makefile.kmk (修改) (5 筆差異)

trunk/src/VBox/VMM/Makefile.kmk

@@ -24 +24 @@
 
 #
+# Globals
+#
+
+## DEFS variable that is picked up by all three VMM targets.
+# Can be prepended to by setting it in LocalConfig.kmk
+VMM_COMMON_DEFS ?=
+ifdef VBOX_WITH_RAW_MODE
+ VMM_COMMON_DEFS += VBOX_WITH_RAW_MODE
+endif
+ifdef VBOX_WITH_MULTI_CORE
+ VMM_COMMON_DEFS += VBOX_WITH_MULTI_CORE
+endif
+ifdef VBOX_WITH_R0_LOGGING
+ VMM_COMMON_DEFS += VBOX_WITH_R0_LOGGING
+endif
+# VMM_COMMON_DEFS += VBOX_WITH_NS_ACCOUNTING_STATS
+
+
+#
 # VMMR3.dll
 #
@@ -30 +49 @@
 VMMR3_TEMPLATE  = VBoxR3Dll
 
-VMMR3_DEFS      = IN_VMM_R3 IN_DIS IN_GMM_R3 IN_DBG
+VMMR3_DEFS      = IN_VMM_R3 IN_DIS IN_GMM_R3 IN_DBG $(VMM_COMMON_DEFS)
 ## @todo eliminate IN_GMM_R3
 ifdef VBOX_WITH_PREALLOC_RAM_BY_DEFAULT
  VMMR3_DEFS    += VBOX_WITH_PREALLOC_RAM_BY_DEFAULT
 endif
-ifdef VBOX_WITH_R0_LOGGING
- VMMR3_DEFS    += VBOX_WITH_R0_LOGGING
-endif
-ifdef VBOX_WITH_MULTI_CORE
- VMMR3_DEFS    += VBOX_WITH_MULTI_CORE
-endif
 ifdef VBOX_WITH_VUSB
  VMMR3_DEFS    += VBOX_WITH_USB
@@ -46 +59 @@
 ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
  VMMR3_DEFS    += VBOX_WITH_PDM_ASYNC_COMPLETION
-endif
-ifdef VBOX_WITH_LIVE_MIGRATION
- VMMR3_DEFS    += VBOX_WITH_LIVE_MIGRATION
-endif
-ifdef VBOX_WITH_RAW_MODE
- VMMR3_DEFS    += VBOX_WITH_RAW_MODE
 endif
 VMMR3_DEFS.darwin = VMM_R0_SWITCH_STACK
@@ -315 +322 @@
  VMMGC_SYSSUFF   = .gc
 
- VMMGC_DEFS      = IN_VMM_RC IN_RT_RC IN_DIS DIS_CORE_ONLY VBOX_WITH_RAW_MODE
- ifdef VBOX_WITH_R0_LOGGING
-  VMMGC_DEFS    += VBOX_WITH_R0_LOGGING
- endif
- ifdef VBOX_WITH_MULTI_CORE
-  VMMGC_DEFS    += VBOX_WITH_MULTI_CORE
- endif
+ VMMGC_DEFS      = IN_VMM_RC IN_RT_RC IN_DIS DIS_CORE_ONLY VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS)
  ifeq ($(KBUILD_TARGET_ARCH),x86)
   VMMGC_DEFS.darwin = VMM_R0_SWITCH_STACK
@@ -415 +416 @@
 VMMR0_SYSSUFF   = .r0
 
-VMMR0_DEFS      = IN_VMM_R0 IN_RT_R0 IN_DIS DIS_CORE_ONLY IN_GVMM_R0 IN_GMM_R0 IN_INTNET_R0 RTASSERT_HAVE_SHOULD_PANIC
+VMMR0_DEFS      = IN_VMM_R0 IN_RT_R0 IN_DIS DIS_CORE_ONLY IN_GVMM_R0 IN_GMM_R0 IN_INTNET_R0 \
+        $(VMM_COMMON_DEFS) RTASSERT_HAVE_SHOULD_PANIC
 ## @todo eliminate IN_GVMM_R0 IN_GMM_R0
-ifdef VBOX_WITH_R0_LOGGING
- VMMR0_DEFS    += VBOX_WITH_R0_LOGGING
-endif
 ifdef VBOX_WITH_VMMR0_DISABLE_PREEMPTION
  VMMR0_DEFS    += VBOX_WITH_VMMR0_DISABLE_PREEMPTION
-endif
-ifdef VBOX_WITH_MULTI_CORE
- VMMR0_DEFS    += VBOX_WITH_MULTI_CORE
-endif
-ifdef VBOX_WITH_RAW_MODE
- VMMR0_DEFS    += VBOX_WITH_RAW_MODE
 endif
 VMMR0_DEFS.darwin = VMM_R0_SWITCH_STACK