Changeset 23746 in vbox for trunk/src

Timestamp:

Oct 14, 2009 8:40:44 AM (15 years ago)

Author:

vboxsync

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

53471

Message:

video 2d accel: some code cleaning

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

-              r23740
+              r23746
 #  VBoxOGL2D_LRCTOOL = QT4
   VBoxOGL2D_SDKS = QT4
   VBoxOGL2D_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS)
+  VBoxOGL2D_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS) VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL
   VBoxOGL2D_QT_MODULES += OpenGL
   VBoxOGL2D_SOURCES = \
       src/VBoxGLSupportInfo.cpp
+  VBoxOGL2D_INCS = include
  endif
 endif

-              r23740
+              r23746
 #ifndef __VBoxFBOverlay_h__
 #define __VBoxFBOverlay_h__
 #if defined (VBOX_GUI_USE_QGL)
+#if defined (VBOX_GUI_USE_QGL) || defined(VBOX_WITH_VIDEOHWACCEL)
 //#define VBOXQGL_PROF_BASE 1
 …
 #include <VBox/VBoxGL2D.h>
+#include "VBoxFBOverlayCommon.h"
 #define VBOXVHWA_ALLOW_PRIMARY_AND_OVERLAY_ONLY 1

r23743	r23746
35	35
36	36	#include <VBox/VBoxGL2D.h>
	37	#include "VBoxFBOverlayCommon.h"
37	38
38	39	/*****************/

Note: See TracChangeset for help on using the changeset viewer.