← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/Devices/Makefile.kmk

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-12-05 11:27:36 UTC
  • mfrom: (0.3.11 upstream) (0.4.21 sid)
  • Revision ID: james.westby@ubuntu.com-20101205112736-os9dcg0r9dxbfpa0
Tags: 3.2.12-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
  - Add ubuntu-01-fix-build-gcc45.patch to fix FTBFS due to uninitalized
    variables.
  - Add ubuntu-02-as-needed.patch to fix FTBFS with --as-needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Devices/Makefile.kmk
213
213
endif
214
214
 
215
215
ifdef VBOX_WITH_NETFLT
216
 
 VBoxDD_LIBS.win      += $(PATH_LIB)/WinNetConfig.lib
 
216
 VBoxDD_LIBS.win       += $(PATH_LIB)/WinNetConfig.lib
217
217
endif
218
218
 
219
219
ifdef VBOX_WITH_EFI
220
 
 VBoxDD_LIBS          += $(PATH_LIB)/EfiThunkBin$(VBOX_SUFF_LIB)
 
220
 VBoxDD_LIBS           += $(PATH_LIB)/EfiThunkBin$(VBOX_SUFF_LIB)
221
221
endif
222
222
 
223
223
ifeq ($(KBUILD_TARGET),solaris)
349
349
endif
350
350
ifdef VBOXVDMA
351
351
 DevicesR3_DEFS        += VBOXVDMA
352
 
 DevicesR3_SOURCES      += \
 
352
 DevicesR3_SOURCES     += \
353
353
        Graphics/HGSMI/SHGSMIHost.cpp \
354
354
    Graphics/DevVGA_VDMA.cpp
355
355
endif
356
356
ifdef VBOXWDDM_WITH_VBVA
357
357
 DevicesR3_DEFS        += VBOXWDDM_WITH_VBVA
358
358
endif
359
 
 
360
359
ifdef VBOX_WITH_VIDEOHWACCEL
361
360
 DevicesR3_DEFS        += VBOX_WITH_VIDEOHWACCEL
362
361
endif
583
582
  VBoxDDGC_DEFS        += VBOXVDMA
584
583
 endif
585
584
 ifdef VBOXWDDM_WITH_VBVA
586
 
  VBoxDDGC_DEFS         += VBOXWDDM_WITH_VBVA
 
585
  VBoxDDGC_DEFS        += VBOXWDDM_WITH_VBVA
587
586
 endif
588
587
 
589
588
 ifdef VBOX_WITH_VUSB
601
600
  endif
602
601
 endif
603
602
 
604
 
 ifdef VBOX_WITH_HGSMI
605
 
  VBoxDDGC_DEFS        += VBOX_WITH_HGSMI
606
 
 endif
607
 
 ifdef VBOXVDMA
608
 
  VBoxDDGC_DEFS        += VBOXVDMA
609
 
 endif
610
 
 ifdef VBOXWDDM_WITH_VBVA
611
 
  VBoxDDGC_DEFS         += VBOXWDDM_WITH_VBVA
612
 
 endif
613
 
 
614
603
 ifdef VBOX_WITH_VIDEOHWACCEL
615
604
  VBoxDDGC_DEFS        += VBOX_WITH_VIDEOHWACCEL
616
605
 endif
733
722
        Storage/DevLsiLogicSCSI.cpp
734
723
endif
735
724
 
736
 
ifdef VBOX_WITH_HGSMI
737
 
 VBoxDDR0_DEFS         += VBOX_WITH_HGSMI
738
 
endif
739
725
ifdef VBOX_WITH_VIDEOHWACCEL
740
726
 VBoxDDR0_DEFS         += VBOX_WITH_VIDEOHWACCEL
741
727
endif
742
 
ifdef VBOXVDMA
743
 
 VBoxDDR0_DEFS         += VBOXVDMA
744
 
endif
745
 
ifdef VBOXWDDM_WITH_VBVA
746
 
 VBoxDDR0_DEFS        += VBOXWDDM_WITH_VBVA
747
 
endif
748
 
 
749
728
 
750
729
ifdef VBOX_WITH_HPET
751
730
 VBoxDDR0_DEFS         += VBOX_WITH_HPET