Changeset 20095 in vbox for trunk/src/VBox

Timestamp:

May 27, 2009 3:27:39 PM (16 years ago)

Author:

vboxsync

Message:

Main: disable 3d test to fix builds

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (3 diffs)
• Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Main/HostImpl.cpp

@@ -112 +112 @@
 
 #ifdef VBOX_WITH_CROGL
-# include "cr_spu.h"
+//# include "cr_spu.h"
 #endif /* VBOX_WITH_CROGL */
 
@@ -254 +254 @@
 
     /* Test for 3D hardware acceleration support */
-    f3DAccelerationSupported = false;
+    f3DAccelerationSupported = true;
 
 #ifdef VBOX_WITH_CROGL
-    SPU *spu;
+/*  SPU *spu;
     spu = crSPULoad(NULL, 0, "render", NULL, NULL);
     if (spu)
@@ -263 +263 @@
         crSPUUnloadChain(spu);
         f3DAccelerationSupported = true;
-    }
+    }*/
 #endif /* VBOX_WITH_CROGL */
 

trunk/src/VBox/Main/Makefile.kmk

@@ -401 +401 @@
 endif
 
-ifdef VBOX_WITH_CROGL
- VBoxSVC_INCS += $(VBOX_PATH_CROGL_INCLUDE) $(VBOX_PATH_CROGL_GENFILES)
- VBoxSVC_DEFS         += $(TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS)
- VBoxSVC_DEFS.win     += $(TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.win)
- VBoxSVC_DEFS.linux   += $(TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.linux)
- VBoxSVC_DEFS.solaris += $(TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.solaris)
- VBoxSVC_DEFS.darwin  += $(TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.darwin)
- VBoxSVC_LIBS         += \
-    $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
-    $(VBOX_LIB_OGL_HOSTCRUTIL)
-endif
-
 win/VBoxSVC.rc_INCS  = $(PATH_VBoxSVC)
 win/VBoxSVC.rc_DEPS  = $(PATH_VBoxSVC)/VBoxSVC.rgs $(PATH_VBoxSVC)/VBoxSVC-icon.rc