← Back to branch summary

~ubuntu-branches/ubuntu/natty/virtualbox-ose/natty

« back to all changes in this revision

Viewing changes to src/VBox/Frontends/VirtualBox/Makefile.kmk

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-10-15 02:12:28 UTC
  • mfrom: (0.3.10 upstream) (0.4.19 sid)
  • Revision ID: james.westby@ubuntu.com-20101015021228-5e6vbxgtes8mg189
Tags: 3.2.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - VirtualBox should go in Accessories, not in System tools.
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - 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. Thanks to Lubomir Rintel <lkundrak@v3.sk> for the patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Frontends/VirtualBox/Makefile.kmk
127
127
        $(if $(VBOX_WITH_SOLARIS_OSS),VBOX_WITH_SOLARIS_OSS) \
128
128
        $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \
129
129
        $(if $(VBOX_WITH_NETFLT)$(eq $(KBUILD_TARGET),freebsd),VBOX_WITH_NETFLT) \
130
 
        $(if $(VBOX_WITH_VDE),VBOX_WITH_VDE)
 
130
        $(if $(VBOX_WITH_VDE),VBOX_WITH_VDE) \
 
131
        $(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI)
131
132
ifdef VBOX_WITH_DEBUGGER_GUI
132
133
 VirtualBox_DEFS        += VBOX_WITH_DEBUGGER_GUI
133
134
 if "$(KBUILD_TYPE)" != "release"
236
237
 VirtualBox_LIBS.win     += $(PATH_SDK_WINPSDK_LIB)/Opengl32.lib
237
238
 VirtualBox_LIBS.solaris += GL
238
239
 VirtualBox_LIBS.linux   += GL
 
240
 VirtualBox_LIBS.freebsd += GL
239
241
endif
240
242
 
241
243
# Headers containing definitions of classes that use the Q_OBJECT macro.
821
823
# App for testing GL support
822
824
#
823
825
if defined(VBOX_WITH_VIDEOHWACCEL)
824
 
 if1of ($(KBUILD_TARGET), win linux)
 
826
 if1of ($(KBUILD_TARGET), win linux freebsd)
825
827
  LIBRARIES += VBoxOGL2D
826
828
  VBoxOGL2D_TEMPLATE = VBOXR3STATIC
827
829
  VBoxOGL2D_USES = qt4