Changeset 83819 in vbox

Timestamp:

Apr 19, 2020 12:59:03 AM (5 years ago)

Author:

vboxsync

Message:

OpenGLTest/Makefile.kmk: Corrected depth and made VC++ 14.1 adjustments. bugref:8489

File:

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

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

@@ -16 +16 @@
 #
 
-SUB_DEPTH = ../../../..
+SUB_DEPTH = ../../../../..
 include $(KBUILD_PATH)/subheader.kmk
 
@@ -48 +48 @@
   VBoxTestOGL_DEFS.darwin      = DARWIN=1 GL_GLEXT_LEGACY _GNU_SOURCE
   VBoxTestOGL_DEFS.freebsd     = FreeBSD=1 _GNU_SOURCE
+  ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+   VBoxTestOGL_DEFS = VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)"
+  else
+   VBoxTestOGL_DEFS = VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
+  endif
+  ifdef VBOX_WITH_VIDEOHWACCEL
+   VBoxTestOGL_DEFS += VBOX_WITH_VIDEOHWACCEL
+  endif
   VBoxTestOGL_SOURCES = OpenGLTestApp.cpp
   VBoxTestOGL_SOURCES.win = VBoxTestOGL.rc
@@ -53 +61 @@
         $(if $(VBOX_WITH_VIDEOHWACCEL), $(PATH_STAGE_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB),) \
         $(LIB_RUNTIME)
-  VBoxTestOGL_DEFS += \
-    VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" \
-    $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL,)
   ifdef VBOX_WITH_VIDEOHWACCEL
    VBoxTestOGL_QT_MODULES   += Core Gui OpenGL Widgets