projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6ed0f2a
)
glsl: Fix parallel build.
author
Tobias Jakobi
<liquid.acid@gmx.net>
Fri, 11 Feb 2011 18:36:14 +0000
(10:36 -0800)
committer
Kenneth Graunke
<kenneth@whitecape.org>
Fri, 11 Feb 2011 18:36:14 +0000
(10:36 -0800)
Broken since
e0c1fc32832b66b52e6352ba563288ee48a1face
.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
src/glsl/Makefile
patch
|
blob
|
history
diff --git
a/src/glsl/Makefile
b/src/glsl/Makefile
index 3c00d1fd1fb007cd46d76da16845edaed6eb992b..5567555a90f637b242ff77d24eb4683e9d7fc246 100644
(file)
--- a/
src/glsl/Makefile
+++ b/
src/glsl/Makefile
@@
-13,6
+13,7
@@
LIBGLCPP_SOURCES = \
GLCPP_SOURCES = \
$(LIBGLCPP_SOURCES) \
+ ralloc.c \
glcpp/glcpp.c
C_SOURCES = \
@@
-154,7
+155,7
@@
glsl_compiler: $(GLSL2_OBJECTS) libglsl.a builtin_stubs.o
glcpp: glcpp/glcpp
glcpp/glcpp: $(GLCPP_OBJECTS)
- $(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLCPP_OBJECTS)
$(LIBS)
-o $@
+ $(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLCPP_OBJECTS) -o $@
.cpp.o:
$(CXX) -c $(INCLUDES) $(CXXFLAGS) $(DEFINES) $< -o $@