Move GL/glx on level up now that it's the only thing left under GL.
(cherry picked from commit c3eb5b80d8
)
This commit is contained in:
parent
cb402b4112
commit
a194718e9d
|
@ -1,9 +0,0 @@
|
||||||
SUBDIRS = glx
|
|
||||||
|
|
||||||
WINDOWS_EXTRAS = \
|
|
||||||
windows/ChangeLog \
|
|
||||||
windows/glwindows.h \
|
|
||||||
windows/glwrap.c \
|
|
||||||
windows/indirect.c
|
|
||||||
|
|
||||||
EXTRA_DIST = symlink-mesa.sh $(WINDOWS_EXTRAS)
|
|
|
@ -23,7 +23,7 @@ MFB_DIR=mfb
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if GLX
|
if GLX
|
||||||
GLX_DIR=GL
|
GLX_DIR=glx
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if DBE
|
if DBE
|
||||||
|
@ -103,7 +103,7 @@ DIST_SUBDIRS = \
|
||||||
damageext \
|
damageext \
|
||||||
XTrap \
|
XTrap \
|
||||||
composite \
|
composite \
|
||||||
GL \
|
glx \
|
||||||
exa \
|
exa \
|
||||||
config \
|
config \
|
||||||
hw
|
hw
|
||||||
|
|
|
@ -827,7 +827,7 @@ if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then
|
||||||
PKG_CHECK_MODULES([GL], [glproto >= 1.4.9 gl >= 7.1.0])
|
PKG_CHECK_MODULES([GL], [glproto >= 1.4.9 gl >= 7.1.0])
|
||||||
AC_SUBST(XLIB_CFLAGS)
|
AC_SUBST(XLIB_CFLAGS)
|
||||||
AC_DEFINE(GLXEXT, 1, [Build GLX extension])
|
AC_DEFINE(GLXEXT, 1, [Build GLX extension])
|
||||||
GLX_LIBS='$(top_builddir)/GL/glx/libglx.la'
|
GLX_LIBS='$(top_builddir)/glx/libglx.la'
|
||||||
GLX_SYS_LIBS="$GLX_SYS_LIBS $DLOPEN_LIBS"
|
GLX_SYS_LIBS="$GLX_SYS_LIBS $DLOPEN_LIBS"
|
||||||
else
|
else
|
||||||
GLX=no
|
GLX=no
|
||||||
|
@ -1730,7 +1730,7 @@ fi
|
||||||
if test "x$XQUARTZ" = xyes; then
|
if test "x$XQUARTZ" = xyes; then
|
||||||
AC_DEFINE([XQUARTZ],[1],[Have Quartz])
|
AC_DEFINE([XQUARTZ],[1],[Have Quartz])
|
||||||
|
|
||||||
DARWIN_GLX_LIBS='$(top_builddir)/hw/xquartz/GL/libCGLCore.la $(top_builddir)/GL/glx/libglx.la'
|
DARWIN_GLX_LIBS='$(top_builddir)/hw/xquartz/GL/libCGLCore.la $(top_builddir)/glx/libglx.la'
|
||||||
DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $DARWIN_GLX_LIBS"
|
DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $DARWIN_GLX_LIBS"
|
||||||
AC_SUBST([DARWIN_LIBS])
|
AC_SUBST([DARWIN_LIBS])
|
||||||
|
|
||||||
|
@ -2093,8 +2093,7 @@ XORG_MANPAGE_SECTIONS
|
||||||
|
|
||||||
AC_OUTPUT([
|
AC_OUTPUT([
|
||||||
Makefile
|
Makefile
|
||||||
GL/Makefile
|
glx/Makefile
|
||||||
GL/glx/Makefile
|
|
||||||
include/Makefile
|
include/Makefile
|
||||||
afb/Makefile
|
afb/Makefile
|
||||||
composite/Makefile
|
composite/Makefile
|
||||||
|
|
Loading…
Reference in New Issue
Block a user