| 1234567891011121314151617181920212223242526272829303132333435363738394041424344 |
- Index: virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk
- ===================================================================
- --- virtualbox.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-04-02 15:44:24.955670965 +0200
- +++ virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-04-02 15:44:24.955670965 +0200
- @@ -67,18 +67,12 @@
- VBoxOGL_INCS = .
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGL_INCS += \
- - $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
- - $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
- - $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
- - $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
- - $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
- - $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
- - $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
- - $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
- - $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- - $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
- + /usr/include/x11 \
- + /usr/include/xorg \
- + /usr/include/pixman-1 \
- $(VBOX_MESA_INCS) \
- - $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
- + /usr/include/drm \
- + /usr/include/libdrm
- VBoxOGL_DEFS += VBOX_NO_NATIVEGL
- endif
-
- @@ -213,10 +207,10 @@
-
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGL_LIBS += \
- - $(PATH_STAGE_LIB)/libXcomposite.so \
- - $(PATH_STAGE_LIB)/libXdamage.so \
- - $(PATH_STAGE_LIB)/libXfixes.so \
- - $(PATH_STAGE_LIB)/libXext.so
- + Xcomposite \
- + Xdamage \
- + Xfixes \
- + Xext
- ifdef VBoxOGL_FAKEDRI
- ifeq ($(KBUILD_TARGET), freebsd)
- VBoxOGL_LIBS += \
|
