Changeset 17543 in vbox

Timestamp:

Mar 8, 2009 12:00:34 PM (16 years ago)

Author:

vboxsync

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

43979

Message:

Additions/crOpenGL: moved the code from the Windows Additions to the common Additions code and enabled building for non-OSE Linux

Location:

trunk/src/VBox/Additions

Files:

• WINNT/Graphics/Makefile.kmk (modified) (1 diff)
• common/Makefile.kmk (modified) (1 diff)
• common/crOpenGL (moved) (moved from trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL )
• common/crOpenGL/Makefile.kmk (modified) (1 diff)
• common/crOpenGL/VBoxCROGL.rc (modified) (1 prop)

trunk/src/VBox/Additions/WINNT/Graphics/Makefile.kmk

@@ -26 +26 @@
 include $(PATH_SUB_CURRENT)/Miniport/Makefile.kmk
 include $(PATH_SUB_CURRENT)/Display/Makefile.kmk
-ifdef VBOX_WITH_CROGL
-include $(PATH_SUB_CURRENT)/crOpenGL/Makefile.kmk
-endif
 
 #

trunk/src/VBox/Additions/common/Makefile.kmk

@@ -32 +32 @@
  include $(PATH_SUB_CURRENT)/VBoxService/Makefile.kmk
 endif
+ifdef VBOX_WITH_CROGL
+include $(PATH_SUB_CURRENT)/crOpenGL/Makefile.kmk
+endif
 
 include $(KBUILD_PATH)/subfooter.kmk
-

trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk

@@ -29 +29 @@
         $(VBOX_PATH_CROGL_GENFILES)/
 
-DLLS += VBoxOGL VBoxOGLarrayspu VBoxOGLpassthroughspu VBoxOGLpackspu VBoxOGLfeedbackspu
+DLLS.win += \
+    VBoxOGL \
+    VBoxOGLarrayspu \
+    VBoxOGLpassthroughspu \
+    VBoxOGLpackspu \
+    VBoxOGLfeedbackspu
+
+ifndef VBOX_OSE  ## @todo Solaris too?
+DLLS.linux += \
+    VBoxOGL \
+    VBoxOGLarrayspu \
+    VBoxOGLpassthroughspu \
+    VBoxOGLpackspu \
+    VBoxOGLfeedbackspu
+endif
 
 ifeq ($(KBUILD_TARGET),linux)
  VBoxOGL_DRI = 1
- VBOX_PATH_MESA_SOURCE = /usr/share/mesa-source
+ VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2
 endif