Changeset 25213 in vbox for trunk/src

Timestamp:

Dec 7, 2009 3:41:35 PM (15 years ago)

Author:

vboxsync

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

55705

Message:

2d accel: delay loading gl dlls for win

Location:

trunk/src/VBox

Files:

• Devices/Graphics/DevVGA_VBVA.cpp (modified) (2 diffs)
• Frontends/VirtualBox/Makefile.kmk (modified) (1 diff)
• Frontends/VirtualBox/include (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/include )

trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

@@ -1101 +1101 @@
         {
             rc = pCmd->rc;
-#ifdef DEBUG_misha
-            AssertMsg(RT_SUCCESS(rc), ("%Rrc\n", rc));
-#else
             AssertMsg(RT_SUCCESS(rc) || rc == VERR_NOT_IMPLEMENTED, ("%Rrc\n", rc));
-#endif
             if(rc == VERR_NOT_IMPLEMENTED)
             {
@@ -1133 +1129 @@
         {
             rc = pCmd->rc;
-#ifdef DEBUG_misha
-            AssertMsg(RT_SUCCESS(rc), ("%Rrc\n", rc));
-#else
             AssertMsg(RT_SUCCESS(rc) || rc == VERR_NOT_IMPLEMENTED, ("%Rrc\n", rc));
-#endif
             if (rc == VERR_NOT_IMPLEMENTED)
                 rc = VINF_SUCCESS;

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

@@ -241 +241 @@
  endif
 endif
+
+if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
+ VirtualBox_LDFLAGS.win += /DelayLoad:QtOpenGLVBox4.dll /DelayLoad:OPENGL32.dll
+endif
+
 # r=bird: what is -lz doing here? it belongs in LIBS.
 VirtualBox_LDFLAGS.darwin = -lz \