diff options
| author | Keith Whitwell <[email protected]> | 2008-09-12 10:31:23 +0100 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2008-09-12 10:31:23 +0100 |
| commit | 176c454765b88c71d8b1ef474bc0fd53cb253a08 (patch) | |
| tree | 76a2aee9ab3ae7f94661faf305d1b7b7b82b5cb3 /progs | |
| parent | 1f135456795adfb1d739a6fb66ab9540aa79b461 (diff) | |
| parent | aa66f08a21b791f338b519f0c2162cd8f7b3aeb0 (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
progs/fp/Makefile
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/fp/Makefile | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/progs/fp/Makefile b/progs/fp/Makefile index 2089fc5cb3c..ab43cde4f3a 100644 --- a/progs/fp/Makefile +++ b/progs/fp/Makefile @@ -40,13 +40,13 @@ UTIL_FILES = readtex.h readtex.c .SUFFIXES: .c .c: - $(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@ + $(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@ .c.o: - $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ + $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ .S.o: - $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ + $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ ##### TARGETS ##### @@ -67,19 +67,27 @@ 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 texrect.o: texrect.c readtex.h - $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ + $(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 invert.o: invert.c readtex.h - $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ + $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ readtex.o: readtex.c - $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ + $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ readtex.h: $(TOP)/progs/util/readtex.h |