Changeset 67067 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk

Timestamp:

May 24, 2017 3:43:59 PM (8 years ago)

Author:

vboxsync

Message:

drop VBOX_WITH_QTGUI_V5 and friends

File:

• trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk

@@ -420 +420 @@
  ifneq ($(KBUILD_TARGET),darwin)
   ifdef VBOX_WITH_VIDEOHWACCEL
-   ifndef VBOX_WITH_QTGUI_V5
-    USES += qt4
-   else # VBOX_WITH_QTGUI_V5
-    USES += qt5
-   endif # VBOX_WITH_QTGUI_V5
+   USES += qt5
   endif
   PROGRAMS += VBoxTestOGL
@@ -441 +437 @@
     $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL,)
   ifdef VBOX_WITH_VIDEOHWACCEL
-   VBoxTestOGL_QT_MODULES     += Core Gui OpenGL
-   ifdef VBOX_WITH_QTGUI_V5
-    # Qt5 requires additional modules:
-    VBoxTestOGL_QT_MODULES += Widgets
-    VBoxTestOGL_LIBS.linux   += xcb
-    VBoxTestOGL_LIBS.solaris += xcb
-    VBoxTestOGL_LIBS.freebsd += xcb
-   endif # VBOX_WITH_QTGUI_V5
+   VBoxTestOGL_QT_MODULES   += Core Gui OpenGL Widgets
+   VBoxTestOGL_LIBS.linux   += xcb
+   VBoxTestOGL_LIBS.solaris += xcb
+   VBoxTestOGL_LIBS.freebsd += xcb
    VBoxTestOGL_LDFLAGS.darwin += -framework OpenGL
    VBoxTestOGL_LIBS.win       += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib