Changeset 85717 in vbox for trunk/src

Timestamp:

Aug 12, 2020 2:21:54 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139864

Message:

OpenGLTest/Makefile.kmk: Only build VBoxOGL2D when needed, so we can successfully disable all Qt bits in the build.

File:

• trunk/src/VBox/Main/src-helper-apps/OpenGLTest/Makefile.kmk (modified) (7 diffs)

trunk/src/VBox/Main/src-helper-apps/OpenGLTest/Makefile.kmk

@@ -35 +35 @@
 
 #
-# App for testing GL support
-#
-if defined(VBOX_WITH_VIDEOHWACCEL)
- if1of ($(KBUILD_TARGET), win linux freebsd)
-  LIBRARIES += VBoxOGL2D
-  VBoxOGL2D_TEMPLATE = $(if $(VBOX_WITH_VIDEOHWACCEL),$(if $(VBOX_WITH_HARDENING),VBOXQTGUI,VBOXQTGUIEXE),VBOXMAINEXE)
-  VBoxOGL2D_DEFS = QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL
-  VBoxOGL2D_QT_MODULES += OpenGL
-  VBoxOGL2D_SOURCES = VBoxGLSupportInfo.cpp
- endif
-endif
-
-#
 # VBoxTestOGL - OpenGL support test app.
 # Note! Doesn't link with VBOX_WITH_DEBUG_VCC_CRT defined because it uses Qt.
@@ -55 +42 @@
     && !defined(VBOX_WITH_DEBUG_VCC_CRT))
  ifneq ($(KBUILD_TARGET),darwin)
+
   ifdef VBOX_WITH_VIDEOHWACCEL
    USES += qt5
@@ -63 +51 @@
   VBoxTestOGL_DEFS.linux       = Linux=1 _GNU_SOURCE
   VBoxTestOGL_DEFS.solaris     = SunOS=1 _GNU_SOURCE #GLEXT_64_TYPES_DEFINED
-  VBoxTestOGL_DEFS.darwin      = DARWIN=1 GL_GLEXT_LEGACY _GNU_SOURCE
   VBoxTestOGL_DEFS.freebsd     = FreeBSD=1 _GNU_SOURCE
   ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
@@ -70 +57 @@
    VBoxTestOGL_DEFS = VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
   endif
+  VBoxTestOGL_SOURCES = OpenGLTestApp.cpp
+  VBoxTestOGL_SOURCES.win = VBoxTestOGL.rc
+  VBoxTestOGL_LIBS = $(LIB_RUNTIME)
   ifdef VBOX_WITH_VIDEOHWACCEL
    VBoxTestOGL_DEFS += VBOX_WITH_VIDEOHWACCEL
-  endif
-  VBoxTestOGL_SOURCES = OpenGLTestApp.cpp
-  VBoxTestOGL_SOURCES.win = VBoxTestOGL.rc
-  VBoxTestOGL_LIBS = \
-        $(if $(VBOX_WITH_VIDEOHWACCEL), $(PATH_STAGE_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB),) \
-        $(LIB_RUNTIME)
-  ifdef VBOX_WITH_VIDEOHWACCEL
-   VBoxTestOGL_QT_MODULES   += Core Gui OpenGL Widgets
-   VBoxTestOGL_LIBS.linux   += xcb
-   VBoxTestOGL_LIBS.solaris += xcb
-   VBoxTestOGL_LIBS.freebsd += xcb
-   VBoxTestOGL_LDFLAGS.darwin += -framework OpenGL -framework IOKit
+   VBoxTestOGL_LIBS <= $(PATH_STAGE_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB)
+   VBoxTestOGL_QT_MODULES     += Core Gui OpenGL Widgets
+   VBoxTestOGL_LIBS.linux     += xcb
+   VBoxTestOGL_LIBS.solaris   += xcb
+   VBoxTestOGL_LIBS.freebsd   += xcb
    VBoxTestOGL_LIBS.win       += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
    if1of ($(KBUILD_TARGET), solaris linux freebsd)
@@ -89 +72 @@
     VBoxTestOGL_LIBS += GL pthread dl
    endif
+   ## @todo not sure why this is a separate library, but whatever.
+   LIBRARIES += VBoxOGL2D
+   VBoxOGL2D_TEMPLATE = $(if $(VBOX_WITH_VIDEOHWACCEL),$(if $(VBOX_WITH_HARDENING),VBOXQTGUI,VBOXQTGUIEXE),VBOXMAINEXE)
+   VBoxOGL2D_DEFS = QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL
+   VBoxOGL2D_QT_MODULES += OpenGL
+   VBoxOGL2D_SOURCES = VBoxGLSupportInfo.cpp
   endif
   if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # the X11 gang
@@ -96 +85 @@
    VBoxTestOGL_LIBPATH = \
         $(VBOX_LIBPATH_X11)
-endif
+  endif
+
   # Don't let ld strip out explicitly linked libraries even when they are not needed.
   # This was causing some dynamic library loading problems in case of indirect dependencies
@@ -102 +92 @@
   VBoxTestOGL_LDFLAGS.linux = -Wl,--no-as-needed
   VBoxTestOGL_LDFLAGS.win = /SUBSYSTEM:windows
- endif
+
+ endif # KBUILD_TARGET != darwin
 endif