AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict breakage

Browse Source
This commit is contained in:
Alan Hourihane
2008-12-08 15:03:29 +00:00
parent 33a1f495d4
commit e8a1b31ddf
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
progs/glsl/Makefile
-4
View File
@@ -189,9 +189,6 @@ trirast.o: trirast.c extfuncs.h shaderutil.h
$(APP_CC) -c -I$(INCDIR) $(CFLAGS) trirast.c
trirast: trirast.o shaderutil.o
<<<<<<< HEAD:progs/glsl/Makefile
$(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) trirast.o shaderutil.o $(LIBS) -o $@
=======
$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) trirast.o shaderutil.o $(LIBS) -o $@
@@ -201,7 +198,6 @@ vert-tex.o: vert-tex.c extfuncs.h shaderutil.h
vert-tex: vert-tex.o shaderutil.o
$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) vert-tex.o shaderutil.o $(LIBS) -o $@
>>>>>>> origin/master:progs/glsl/Makefile