Changeset 62451 in vbox for trunk/src

Timestamp:

Jul 22, 2016 3:11:40 PM (8 years ago)

Author:

vboxsync

Message:

Devices: Makefile.kmk cleanup

File:

• trunk/src/VBox/Devices/Makefile.kmk (modified) (6 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -1016 +1016 @@
  #
  VBoxDD2_TEMPLATE        = VBoxR3DllWarnNoPic
- VBoxDD2_DEFS            = IN_VBOXDD2
+ VBoxDD2_DEFS            = \
+        IN_VBOXDD2 \
+        $(if $(VBOX_WITH_PXE_ROM),VBOX_WITH_PXE_ROM,) \
+        $(if $(VBOX_WITH_NEW_APIC),VBOX_WITH_NEW_APIC,) \
+        $(if $(VBOX_WITH_NEW_IOAPIC),VBOX_WITH_NEW_IOAPIC,)
  VBoxDD2_INCS           := \
         build \
@@ -1022 +1026 @@
  VBoxDD2_SOURCES         = \
         build/VBoxDD2.cpp  \
-        PC/DevLPC.cpp
- ifndef VBOX_WITH_NEW_APIC
-  VBoxDD2_SOURCES += PC/DevAPIC.cpp
- endif
- ifndef VBOX_WITH_NEW_IOAPIC
-  VBoxDD2_SOURCES += PC/DevIoApic.cpp
- endif
+        PC/DevLPC.cpp \
+        $(if $(VBOX_WITH_NEW_APIC),,PC/DevAPIC.cpp) \
+        $(if $(VBOX_WITH_NEW_IOAPIC),,PC/DevIoApic.cpp)
  VBoxDD2_LIBS            = \
         $(PATH_STAGE_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \
@@ -1041 +1041 @@
  VBoxDD2_LDFLAGS.darwin  = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxDD2.dylib
  VBoxDD2_LDFLAGS.linux   = -Wl,--no-undefined
-
- ifdef VBOX_WITH_PXE_ROM
-  VBoxDD2_DEFS          += VBOX_WITH_PXE_ROM
- endif
- ifdef VBOX_WITH_NEW_APIC
-  VBoxDD2_DEFS          += VBOX_WITH_NEW_APIC
- endif
- ifdef VBOX_WITH_NEW_IOAPIC
-  VBoxDD2_DEFS          += VBOX_WITH_NEW_IOAPIC
- endif
 
  $(call VBOX_SET_VER_INFO_DLL,VBoxDD2,VirtualBox VMM Devices and Drivers 2) # (last!)
@@ -1085 +1075 @@
         VMMDev/VMMDevTesting.cpp \
         Network/DrvIntNet.cpp \
-        Network/DrvDedicatedNic.cpp
+        Network/DrvDedicatedNic.cpp \
+        $(VBOX_AUDIO_PATH_SOURCES)/DevIchHda.cpp
 
  VBoxDDR0_SOURCES.win += Parallel/DrvHostParallel.cpp
 
- VBoxDDR0_DEFS          += $(if $(VBOX_WITH_AUDIO_50),VBOX_WITH_AUDIO_50,)
- VBoxDDR0_SOURCES       += \
-        $(VBOX_AUDIO_PATH_SOURCES)/DevIchHda.cpp
+ VBoxDDR0_DEFS          += \
+        $(if $(VBOX_WITH_AUDIO_50),VBOX_WITH_AUDIO_50,) \
+        $(if $(VBOX_WITH_HGSMI),VBOX_WITH_HGSMI,) \
+        $(if $(VBOX_WITH_WDDM),VBOX_WITH_WDDM,) \
+        $(if $(VBOX_WITH_VDMA),VBOX_WITH_VDMA,) \
+        $(if $(VBOX_WITH_CRHGSMI),VBOX_WITH_CRHGSMI,) \
+        $(if $(VBOXWDDM_WITH_VBVA),VBOXWDDM_WITH_VBVA,) \
+        $(if $(VBOX_VDMA_WITH_WATCHDOG),VBOX_VDMA_WITH_WATCHDOG,)
 
  ifdef VBOX_WITH_E1000
@@ -1120 +1116 @@
  ifdef VBOX_WITH_VMSVGA3D
   VBoxDDR0_DEFS         += VBOX_WITH_VMSVGA3D
- endif
-
- ifdef VBOX_WITH_HGSMI
-  VBoxDDR0_DEFS         += VBOX_WITH_HGSMI
- endif
- ifdef VBOX_WITH_WDDM
-  VBoxDDR0_DEFS         += VBOX_WITH_WDDM
- endif
- ifdef VBOX_WITH_VDMA
-  VBoxDDR0_DEFS         += VBOX_WITH_VDMA
- endif
- ifdef VBOX_WITH_CRHGSMI
-  VBoxDDR0_DEFS         += VBOX_WITH_CRHGSMI
- endif
- ifdef VBOXWDDM_WITH_VBVA
-  VBoxDDR0_DEFS         += VBOXWDDM_WITH_VBVA
- endif
- ifdef VBOX_VDMA_WITH_WATCHDOG
-  VBoxDDR0_DEFS        += VBOX_VDMA_WITH_WATCHDOG
  endif
 
@@ -1542 +1519 @@
 
 
-
 endif # defined(VBOX_WITH_VMSVGA3D) && !defined(VBOX_ONLY_EXTPACKS)