Changeset 94142 in vbox for trunk/src/VBox

Timestamp:

Mar 8, 2022 11:05:30 PM (3 years ago)

Author:

vboxsync

Message:

Main/VBoxOGLTest: Use VBOXR3 as template everywhere (alternatively we should use VBOXR3MAINEXE).

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• src-helper-apps/OpenGLTest/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Main/Makefile.kmk

@@ -1045 +1045 @@
 endif
 
-ifdef VBOX_WITH_3D_ACCELERATION
- VBoxC_LIBS += $(PATH_STAGE_LIB)/VBoxOGLTest$(VBOX_SUFF_LIB)
- VBoxC_LDFLAGS.darwin += -framework OpenGL
-endif
-
 ifdef VBOX_WITH_DRAG_AND_DROP
  VBoxC_LIBS += $(PATH_STAGE_LIB)/VBoxDnDHostR3Lib$(VBOX_SUFF_LIB)

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

@@ -21 +21 @@
 
 #
-# Target lists.
+# VBoxOGLTest - Library that VBoxSVC is linked with.
+#
+# On darwin this does the whole job, while on the other platforms it just
+# starts VBoxTestOGL.
 #
 LIBRARIES += VBoxOGLTest
+VBoxOGLTest_TEMPLATE         := VBOXR3
 ifneq ($(KBUILD_TARGET),darwin)
-## @todo r=bird: Why VBOXR3NP?
-VBoxOGLTest_TEMPLATE        = VBOXR3NP
-VBoxOGLTest_SOURCES         = OpenGLTest.cpp
+ VBoxOGLTest_SOURCES         := OpenGLTest.cpp
 else
-VBoxOGLTest_TEMPLATE        = VBoxR3Dll
-VBoxOGLTest_SOURCES.darwin  = OpenGLTestDarwin.cpp
-VBoxOGLTest_CXXFLAGS.darwin = $(VBOX_GCC_Wno-deprecated-declarations)
+ VBoxOGLTest_SOURCES.darwin  := OpenGLTestDarwin.cpp
+ VBoxOGLTest_CXXFLAGS.darwin  = $(VBOX_GCC_Wno-deprecated-declarations)
 endif