fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Makefile was previously checked in with merge diffs still present. I just selected HEAD and removed the old.

Browse source
This commit is contained in:
Jonathan White 2008-09-12 13:24:05 -06:00
parent c9c2b1b016
commit 272810125b
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
progs/fp/Makefile Normal file → Executable file
View file

@ -67,21 +67,15 @@ getproclist.h: $(TOP)/src/mesa/glapi/gl_API.xml getprocaddress.c getprocaddress.
texrect: texrect.o readtex.o
<<<<<<< HEAD:progs/fp/Makefile
$(CC) $(CFLAGS) $(LDFLAGS) texrect.o readtex.o $(LIBS) -o $@
=======
$(APP_CC) texrect.o readtex.o $(LIBS) -o $@
>>>>>>> origin/gallium-0.1:progs/fp/Makefile
# $(APP_CC) texrect.o readtex.o $(LIBS) -o $@
texrect.o: texrect.c readtex.h
$(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
invert: invert.o readtex.o
<<<<<<< HEAD:progs/fp/Makefile
$(CC) $(CFLAGS) $(LDFLAGS) invert.o readtex.o $(LIBS) -o $@
=======
$(APP_CC) invert.o readtex.o $(LIBS) -o $@
>>>>>>> origin/gallium-0.1:progs/fp/Makefile
# $(APP_CC) invert.o readtex.o $(LIBS) -o $@
invert.o: invert.c readtex.h
$(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@