Changeset 17723 in vbox

Timestamp:

Mar 12, 2009 9:08:44 AM (16 years ago)

Author:

vboxsync

Message:

Additions/common/crOpenGL: use in-tree headers again

Location:

trunk/src/VBox/Additions/common

Files:

• Makefile.kmk (modified) (1 diff)
• crOpenGL/Makefile.kmk (modified) (4 diffs)

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

@@ -33 +33 @@
 endif
 ifdef VBOX_WITH_CROGL
-include $(PATH_SUB_CURRENT)/crOpenGL/Makefile.kmk
+ include $(PATH_SUB_CURRENT)/crOpenGL/Makefile.kmk
 endif
 

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

@@ -48 +48 @@
  #VBoxOGL_DRI = 1
  #VBoxOGL_FAKEDRI = 1
- #VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2
- VBOX_PATH_MESA_SOURCE = /mnt/chost/Sun/Mesa-7.2
+ VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2
 endif
 
@@ -68 +67 @@
  VBoxOGL_DEFS          += VBOXOGL_DRI IN_DRI_DRIVER
  VBoxOGL_INCS          += \
+    $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.5
         $(VBOX_PATH_MESA_SOURCE) \
         $(VBOX_PATH_MESA_SOURCE)/include \
@@ -73 +73 @@
         $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \
         $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \
+        $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common \
         $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.5
 else ifdef VBoxOGL_FAKEDRI
@@ -82 +83 @@
         $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \
         $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \
+        $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common \
         $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.5
 endif