glcore: drop GLcore (build system)
This commit is contained in:
parent
567d389d47
commit
dd7a53f8f2
|
@ -2,8 +2,8 @@ if XQUARTZ
|
|||
XQUARTZ_SUBDIRS = apple
|
||||
endif
|
||||
|
||||
SUBDIRS = glx mesa $(XQUARTZ_SUBDIRS)
|
||||
DIST_SUBDIRS = glx mesa apple
|
||||
SUBDIRS = glx $(XQUARTZ_SUBDIRS)
|
||||
DIST_SUBDIRS = glx apple
|
||||
|
||||
WINDOWS_EXTRAS = \
|
||||
windows/ChangeLog \
|
||||
|
|
|
@ -267,7 +267,6 @@ run() {
|
|||
# $1 what to do
|
||||
# $2 explanation
|
||||
|
||||
ACTION=$1 EXPLANATION=$2 run_module mesa
|
||||
ACTION=$1 EXPLANATION=$2 run_module glx
|
||||
}
|
||||
|
||||
|
|
14
configure.ac
14
configure.ac
|
@ -837,7 +837,7 @@ if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then
|
|||
PKG_CHECK_MODULES([GL], [glproto >= 1.4.9])
|
||||
AC_SUBST(XLIB_CFLAGS)
|
||||
AC_DEFINE(GLXEXT, 1, [Build GLX extension])
|
||||
GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la'
|
||||
GLX_LIBS='$(top_builddir)/GL/glx/libglx.la'
|
||||
test -d GL || mkdir GL
|
||||
case $host_os in
|
||||
solaris*)
|
||||
|
@ -2105,18 +2105,6 @@ Makefile
|
|||
GL/Makefile
|
||||
GL/apple/Makefile
|
||||
GL/glx/Makefile
|
||||
GL/mesa/Makefile
|
||||
GL/mesa/glapi/Makefile
|
||||
GL/mesa/main/Makefile
|
||||
GL/mesa/math/Makefile
|
||||
GL/mesa/shader/Makefile
|
||||
GL/mesa/shader/grammar/Makefile
|
||||
GL/mesa/shader/slang/Makefile
|
||||
GL/mesa/swrast/Makefile
|
||||
GL/mesa/swrast_setup/Makefile
|
||||
GL/mesa/tnl/Makefile
|
||||
GL/mesa/vbo/Makefile
|
||||
GL/mesa/X/Makefile
|
||||
include/Makefile
|
||||
afb/Makefile
|
||||
composite/Makefile
|
||||
|
|
|
@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libdixmods.la libxorgxkb.la
|
|||
SUBDIRS = extmod
|
||||
|
||||
if GLX
|
||||
GLXMODS = libglx.la libGLcore.la
|
||||
GLXMODS = libglx.la
|
||||
endif
|
||||
|
||||
if XTRAP
|
||||
|
@ -48,10 +48,6 @@ INCLUDES = @XORG_INCS@ \
|
|||
-I$(top_srcdir)/miext/shadow \
|
||||
-I$(top_srcdir)/GL/glx
|
||||
|
||||
libGLcore_la_LDFLAGS = -avoid-version
|
||||
libGLcore_la_LIBADD = $(top_builddir)/GL/mesa/libGLcore.la
|
||||
libGLcore_la_SOURCES = GLcoremodule.c
|
||||
|
||||
libafb_la_LDFLAGS = -avoid-version
|
||||
libafb_la_LIBADD = $(top_builddir)/afb/libafb.la
|
||||
libafb_la_SOURCES = afbmodule.c
|
||||
|
|
Loading…
Reference in New Issue
Block a user