projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: implement _mesa_GetStringi() for GL3
[mesa.git]
/
src
/
mesa
/
sources.mak
diff --git
a/src/mesa/sources.mak
b/src/mesa/sources.mak
index fa2a6307a4b2669eb0344849a1b8e0ba4bbe0bf7..a7a3b9a7f97d1e65d71a800a80123fe5d21c25ad 100644
(file)
--- a/
src/mesa/sources.mak
+++ b/
src/mesa/sources.mak
@@
-33,6
+33,7
@@
MAIN_SOURCES = \
main/feedback.c \
main/ffvertex_prog.c \
main/fog.c \
main/feedback.c \
main/ffvertex_prog.c \
main/fog.c \
+ main/formats.c \
main/framebuffer.c \
main/get.c \
main/getstring.c \
main/framebuffer.c \
main/get.c \
main/getstring.c \
@@
-55,6
+56,7
@@
MAIN_SOURCES = \
main/rastpos.c \
main/rbadaptors.c \
main/readpix.c \
main/rastpos.c \
main/rbadaptors.c \
main/readpix.c \
+ main/remap.c \
main/renderbuffer.c \
main/scissor.c \
main/shaders.c \
main/renderbuffer.c \
main/scissor.c \
main/shaders.c \
@@
-67,6
+69,7
@@
MAIN_SOURCES = \
main/texcompress_fxt1.c \
main/texenv.c \
main/texenvprogram.c \
main/texcompress_fxt1.c \
main/texenv.c \
main/texenvprogram.c \
+ main/texfetch.c \
main/texformat.c \
main/texgen.c \
main/texgetimage.c \
main/texformat.c \
main/texgen.c \
main/texgetimage.c \
@@
-115,7
+118,6
@@
SWRAST_SOURCES = \
swrast/s_feedback.c \
swrast/s_fog.c \
swrast/s_fragprog.c \
swrast/s_feedback.c \
swrast/s_fog.c \
swrast/s_fragprog.c \
- swrast/s_imaging.c \
swrast/s_lines.c \
swrast/s_logic.c \
swrast/s_masking.c \
swrast/s_lines.c \
swrast/s_logic.c \
swrast/s_masking.c \
@@
-125,7
+127,6
@@
SWRAST_SOURCES = \
swrast/s_stencil.c \
swrast/s_texcombine.c \
swrast/s_texfilter.c \
swrast/s_stencil.c \
swrast/s_texcombine.c \
swrast/s_texfilter.c \
- swrast/s_texstore.c \
swrast/s_triangle.c \
swrast/s_zoom.c
swrast/s_triangle.c \
swrast/s_zoom.c
@@
-190,7
+191,6
@@
STATETRACKER_SOURCES = \
state_tracker/st_cb_bufferobjects.c \
state_tracker/st_cb_clear.c \
state_tracker/st_cb_flush.c \
state_tracker/st_cb_bufferobjects.c \
state_tracker/st_cb_clear.c \
state_tracker/st_cb_flush.c \
- state_tracker/st_cb_get.c \
state_tracker/st_cb_drawpixels.c \
state_tracker/st_cb_fbo.c \
state_tracker/st_cb_feedback.c \
state_tracker/st_cb_drawpixels.c \
state_tracker/st_cb_fbo.c \
state_tracker/st_cb_feedback.c \
@@
-218,7
+218,6
@@
SHADER_SOURCES = \
shader/arbprogparse.c \
shader/arbprogram.c \
shader/atifragshader.c \
shader/arbprogparse.c \
shader/arbprogram.c \
shader/atifragshader.c \
- shader/grammar/grammar_mesa.c \
shader/hash_table.c \
shader/lex.yy.c \
shader/nvfragparse.c \
shader/hash_table.c \
shader/lex.yy.c \
shader/nvfragparse.c \
@@
-255,7
+254,6
@@
SLANG_SOURCES = \
shader/slang/slang_link.c \
shader/slang/slang_log.c \
shader/slang/slang_mem.c \
shader/slang/slang_link.c \
shader/slang/slang_log.c \
shader/slang/slang_mem.c \
- shader/slang/slang_preprocess.c \
shader/slang/slang_print.c \
shader/slang/slang_simplify.c \
shader/slang/slang_storage.c \
shader/slang/slang_print.c \
shader/slang/slang_simplify.c \
shader/slang/slang_storage.c \
@@
-365,6
+363,12
@@
GLAPI_OBJECTS = \
COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
+### Other archives/libraries
+
+GLSL_LIBS = \
+ $(TOP)/src/glsl/pp/libglslpp.a \
+ $(TOP)/src/glsl/cl/libglslcl.a
+
### Include directories
### Include directories