Fix the build system to reflect the rest of the Mesa core. Almost links,
needs a code fix to Mesa though.
This commit is contained in:
parent
d7e2cadb13
commit
6aaceef323
|
@ -1,13 +1,16 @@
|
|||
SUBDIRS = main math array_cache swrast swrast_setup tnl shader X
|
||||
SUBDIRS = glapi main math array_cache swrast swrast_setup tnl shader X
|
||||
|
||||
noinst_LTLIBRARIES = libGLcore.la
|
||||
|
||||
libGLcore_la_SOURCES = dummy.c
|
||||
libGLcore_la_LIBADD = main/libmain.la \
|
||||
libGLcore_la_LIBADD = glapi/libglapi.la \
|
||||
main/libmain.la \
|
||||
math/libmath.la \
|
||||
array_cache/libac.la \
|
||||
swrast/libswrast.la \
|
||||
swrast_setup/libss.la \
|
||||
tnl/libtnl.la \
|
||||
shader/libshader.la \
|
||||
shader/grammar/libgrammar.la \
|
||||
shader/slang/libslang.la \
|
||||
X/libX.la
|
||||
|
|
|
@ -20,7 +20,10 @@ AM_CFLAGS = $(DIX_CFLAGS) -DXFree86Server
|
|||
libX_la_SOURCES = xf86glx.c \
|
||||
xf86glx_util.c \
|
||||
xm_api.c \
|
||||
xm_buffer.c \
|
||||
xm_dd.c \
|
||||
xm_line.c \
|
||||
xm_span.c \
|
||||
xm_tri.c
|
||||
xm_tri.c \
|
||||
indirect_size.c \
|
||||
drivers/common/driverfuncs.c
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
SUBDIRS = grammar slang
|
||||
|
||||
noinst_LTLIBRARIES = libshader.la
|
||||
|
||||
INCLUDES = -I@MESA_SOURCE@/include \
|
||||
|
@ -7,6 +9,8 @@ INCLUDES = -I@MESA_SOURCE@/include \
|
|||
-I$(srcdir)/../main \
|
||||
-I$(srcdir)/../math \
|
||||
-I$(srcdir)/../shader \
|
||||
-I$(srcdir)/../shader/grammar \
|
||||
-I$(srcdir)/../shader/slang \
|
||||
-I$(srcdir)/../swrast \
|
||||
-I$(srcdir)/../swrast_setup \
|
||||
-I$(srcdir)/../tnl \
|
||||
|
@ -23,5 +27,4 @@ libshader_la_SOURCES = arbfragparse.c \
|
|||
nvvertparse.c \
|
||||
program.c \
|
||||
shaderobjects.c \
|
||||
shaderobjects_3dlabs.c \
|
||||
grammar_mesa.c
|
||||
shaderobjects_3dlabs.c
|
||||
|
|
15
GL/mesa/shader/grammar/Makefile.am
Normal file
15
GL/mesa/shader/grammar/Makefile.am
Normal file
|
@ -0,0 +1,15 @@
|
|||
noinst_LTLIBRARIES = libgrammar.la
|
||||
|
||||
INCLUDES = -I@MESA_SOURCE@/include \
|
||||
-I$(srcdir)/../../X \
|
||||
-I$(srcdir)/../../array_cache \
|
||||
-I$(srcdir)/../../glapi \
|
||||
-I$(srcdir)/../../main \
|
||||
-I$(srcdir)/../../math \
|
||||
-I$(srcdir)/../../shader \
|
||||
-I$(srcdir)/../../swrast \
|
||||
-I$(srcdir)/../../swrast_setup \
|
||||
-I$(srcdir)/../../tnl \
|
||||
-I$(srcdir)/../..
|
||||
|
||||
libgrammar_la_SOURCES = grammar_mesa.c
|
25
GL/mesa/shader/slang/Makefile.am
Normal file
25
GL/mesa/shader/slang/Makefile.am
Normal file
|
@ -0,0 +1,25 @@
|
|||
noinst_LTLIBRARIES = libslang.la
|
||||
|
||||
INCLUDES = -I@MESA_SOURCE@/include \
|
||||
-I$(srcdir)/../grammar \
|
||||
-I$(srcdir)/../../X \
|
||||
-I$(srcdir)/../../array_cache \
|
||||
-I$(srcdir)/../../glapi \
|
||||
-I$(srcdir)/../../main \
|
||||
-I$(srcdir)/../../math \
|
||||
-I$(srcdir)/../../shader \
|
||||
-I$(srcdir)/../../swrast \
|
||||
-I$(srcdir)/../../swrast_setup \
|
||||
-I$(srcdir)/../../tnl \
|
||||
-I$(srcdir)/../..
|
||||
|
||||
libslang_la_SOURCES = slang_assemble_assignment.c \
|
||||
slang_assemble.c \
|
||||
slang_assemble_conditional.c \
|
||||
slang_assemble_constructor.c \
|
||||
slang_assemble_typeinfo.c \
|
||||
slang_compile.c \
|
||||
slang_execute.c \
|
||||
slang_preprocess.c \
|
||||
slang_storage.c \
|
||||
slang_utility.c
|
Loading…
Reference in New Issue
Block a user