diff options
| author | Guillaume Melquiond <[email protected]> | 2008-07-30 07:56:42 -0700 |
|---|---|---|
| committer | Dan Nicholson <[email protected]> | 2008-07-30 07:56:42 -0700 |
| commit | 3e8e292db0794a4d2dda1605f86e8f71dbf1d661 (patch) | |
| tree | 084bc2e62e84afa95df02a4897cc7f0449164921 /progs/demos/Makefile | |
| parent | b068ab62a0433b6a92374c83f153b3c9ac4b4e5e (diff) | |
Always pass CFLAGS when compiling or linking demos
To ensure that the correct architecture flags are used, always pass the
user's CFLAGS when compiling or linking the demos. Fixes #16860.
Diffstat (limited to 'progs/demos/Makefile')
| -rw-r--r-- | progs/demos/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/progs/demos/Makefile b/progs/demos/Makefile index fedce1cc3d2..81d9ebed860 100644 --- a/progs/demos/Makefile +++ b/progs/demos/Makefile @@ -125,41 +125,41 @@ extfuncs.h: $(TOP)/progs/util/extfuncs.h reflect: reflect.o showbuffer.o readtex.o - $(CC) $(LDFLAGS) reflect.o showbuffer.o readtex.o $(LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) reflect.o showbuffer.o readtex.o $(LIBS) -o $@ reflect.o: reflect.c showbuffer.h $(CC) -c -I$(INCDIR) $(CFLAGS) reflect.c shadowtex: shadowtex.o showbuffer.o - $(CC) $(LDFLAGS) shadowtex.o showbuffer.o $(LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) shadowtex.o showbuffer.o $(LIBS) -o $@ shadowtex.o: shadowtex.c showbuffer.h $(CC) -c -I$(INCDIR) $(CFLAGS) shadowtex.c gloss: gloss.o trackball.o readtex.o - $(CC) $(LDFLAGS) gloss.o trackball.o readtex.o $(LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) gloss.o trackball.o readtex.o $(LIBS) -o $@ gloss.o: gloss.c trackball.h $(CC) -c -I$(INCDIR) $(CFLAGS) gloss.c engine: engine.o trackball.o readtex.o - $(CC) $(LDFLAGS) engine.o trackball.o readtex.o $(LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) engine.o trackball.o readtex.o $(LIBS) -o $@ engine.o: engine.c trackball.h $(CC) -c -I$(INCDIR) $(CFLAGS) engine.c fslight: fslight.o - $(CC) $(LDFLAGS) fslight.o $(LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) fslight.o $(LIBS) -o $@ fslight.o: fslight.c extfuncs.h $(CC) -c -I$(INCDIR) $(CFLAGS) fslight.c rain: particles.o rain.o readtex.o - $(CXX) $(LDFLAGS) $^ $(LIBS) -o $@ + $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@ rain.o: rain.cxx readtex.h $(CXX) -c -I$(INCDIR) $(CXXFLAGS) $< |