Changeset 23732 in vbox for trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

Timestamp:

Oct 13, 2009 2:46:44 PM (15 years ago)

Author:

vboxsync

Message:

video 2d accel: move gl 2D support check to a separate executable (enabled for win for now), code cleaning, bug-fixing

File:

• trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -484 +484 @@
 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
  VirtualBox_SOURCES += \
-        src/VBoxFBQGL.cpp \
-        src/VBoxFBOverlay.cpp
+    src/VBoxFBQGL.cpp \
+    src/VBoxFBOverlay.cpp \
+    src/VBoxGLSupportInfo.cpp
 endif
 # The Qt modules we're using.
@@ -645 +646 @@
 endif # darwin
 
+#
+# App for testing GL support
+#
+if defined(VBOX_WITH_VIDEOHWACCEL)
+ if1of ($(KBUILD_TARGET), win linux)
+  PROGRAMS += VBoxTestOGL2D
+  VBoxTestOGL2D_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBOXQT4GUI,VBOXQT4GUIEXE)
+  VBoxTestOGL2D_SOURCES = \
+      src/VBoxTestQGLApp.cpp \
+      src/VBoxGLSupportInfo.cpp
+  VBoxTestOGL2D_QT_MODULES = Core Gui OpenGL
+  VBoxTestOGL2D_INCS = include
+  VBoxTestOGL2D_LDFLAGS.darwin += -framework OpenGL
+  VBoxTestOGL2D_LIBS.win     += $(PATH_SDK_WINPSDK_LIB)/Opengl32.lib
+  VBoxTestOGL2D_LIBS.solaris += GL
+ endif 
+endif
 
 #