Just compile with X11 system source and we may remove bundle X11 source code.
|
old
|
new
|
VBoxOGL_TEMPLATE = VBOXCROGLR3GUES
|
| 68 | 68 | VBoxOGL_INCS = . |
| 69 | 69 | if1of ($(KBUILD_TARGET), linux solaris freebsd) |
| 70 | 70 | VBoxOGL_INCS += \ |
| 71 | | $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \ |
| 72 | | $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \ |
| 73 | | $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \ |
| 74 | | $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \ |
| 75 | | $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \ |
| 76 | | $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \ |
| 77 | | $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \ |
| 78 | | $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \ |
| 79 | | $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \ |
| 80 | | $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \ |
| | 71 | /usr/include/x11 \ |
| | 72 | /usr/include/xorg \ |
| | 73 | /usr/include/pixman-1 \ |
| 81 | 74 | $(VBOX_MESA_INCS) \ |
| 82 | | $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13 |
| | 75 | /usr/include/drm \ |
| | 76 | /usr/include/libdrm |
| 83 | 77 | VBoxOGL_DEFS += VBOX_NO_NATIVEGL |
| 84 | 78 | endif |
| 85 | 79 | |
| … |
… |
|
| 214 | 208 | |
| 215 | 209 | if1of ($(KBUILD_TARGET), linux solaris freebsd) |
| 216 | 210 | VBoxOGL_LIBS += \ |
| 217 | | $(PATH_STAGE_LIB)/libXcomposite.so \ |
| 218 | | $(PATH_STAGE_LIB)/libXdamage.so \ |
| 219 | | $(PATH_STAGE_LIB)/libXfixes.so \ |
| 220 | | $(PATH_STAGE_LIB)/libXext.so |
| | 211 | Xcomposite \ |
| | 212 | Xdamage \ |
| | 213 | Xfixes \ |
| | 214 | Xext |
| 221 | 215 | ifdef VBoxOGL_FAKEDRI |
| 222 | 216 | ifeq ($(KBUILD_TARGET), freebsd) |
| 223 | 217 | VBoxOGL_LIBS += \ |