| @@ -14,6 +14,11 @@ LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) | |||
| INCLUDE_DIRS = -I$(TOP)/progs/util | |||
| # using : to avoid APP_CC pointing to CC loop | |||
| CC:=$(APP_CC) | |||
| CFLAGS += -I$(INCDIR) | |||
| LDLIBS=$(LIBS) | |||
| DEMO_SOURCES = \ | |||
| array.c \ | |||
| bitmap.c \ | |||
| @@ -53,28 +58,16 @@ UTIL_SOURCES = \ | |||
| readtex.c | |||
| UTIL_OBJS = $(UTIL_SOURCES:.c=.o) | |||
| PROG_OBJS = $(DEMO_SOURCES:.c=.o) | |||
| PROGS = $(DEMO_SOURCES:%.c=%) | |||
| ##### RULES ##### | |||
| # make .o file from .c file: | |||
| .c.o: | |||
| $(APP_CC) -c -I$(INCDIR) $(CFLAGS) $< -o $@ | |||
| # make executable from .o files | |||
| .o: | |||
| $(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(UTIL_OBJS) $(LIBS) -o $@ | |||
| ##### TARGETS ##### | |||
| default: $(PROGS) | |||
| $(PROG_OBJS): $(UTIL_HEADERS) | |||
| $(PROGS): $(UTIL_OBJS) | |||
| clean: | |||
| -rm -f $(PROGS) | |||
| @@ -84,7 +77,6 @@ clean: | |||
| -rm -f readtex.* | |||
| ##### Extra dependencies | |||
| extfuncs.h: $(TOP)/progs/util/extfuncs.h | |||
| @@ -102,143 +94,3 @@ shaderutil.c: $(TOP)/progs/util/shaderutil.c | |||
| shaderutil.h: $(TOP)/progs/util/shaderutil.h | |||
| cp $< . | |||
| array.o: $(UTIL_HEADERS) | |||
| array: array.o $(UTIL_OBJS) | |||
| bitmap.o: $(UTIL_HEADERS) | |||
| bitmap: bitmap.o $(UTIL_OBJS) | |||
| brick.o: $(UTIL_HEADERS) | |||
| brick: brick.o $(UTIL_OBJS) | |||
| bump.o: $(UTIL_HEADERS) | |||
| bump: bump.o $(UTIL_OBJS) | |||
| convolutions.o: $(UTIL_HEADERS) | |||
| convolutions: convolutions.o $(UTIL_OBJS) | |||
| deriv.o: deriv.c $(UTIL_HEADERS) | |||
| deriv: deriv.o $(UTIL_OBJS) | |||
| identity.o: $(UTIL_HEADERS) | |||
| identity: identity.o $(UTIL_OBJS) | |||
| fragcoord.o: $(UTIL_HEADERS) | |||
| fragcoord: fragcoord.o $(UTIL_OBJS) | |||
| linktest.o: $(UTIL_HEADERS) | |||
| linktest: linktest.o $(UTIL_OBJS) | |||
| mandelbrot.o: $(UTIL_HEADERS) | |||
| mandelbrot: mandelbrot.o $(UTIL_OBJS) | |||
| multinoise.o: $(UTIL_HEADERS) | |||
| multinoise: multinoise.o $(UTIL_OBJS) | |||
| multitex.o: $(UTIL_HEADERS) | |||
| multitex: multitex.o $(UTIL_OBJS) | |||
| noise.o: $(UTIL_HEADERS) | |||
| noise: noise.o $(UTIL_OBJS) | |||
| noise2.o: $(UTIL_HEADERS) | |||
| noise2: noise2.o $(UTIL_OBJS) | |||
| points.o: $(UTIL_HEADERS) | |||
| points: points.o $(UTIL_OBJS) | |||
| pointcoord.o: $(UTIL_HEADERS) | |||
| pointcoord: pointcoord.o $(UTIL_OBJS) | |||
| samplers.o: $(UTIL_HEADERS) | |||
| samplers: samplers.o $(UTIL_OBJS) | |||
| samplers_array.o: $(UTIL_HEADERS) | |||
| samplers_array: samplers_array.o $(UTIL_OBJS) | |||
| shadow_sampler.o: $(UTIL_HEADERS) | |||
| shadow_sampler: shadow_sampler.o $(UTIL_OBJS) | |||
| shtest.o: $(UTIL_HEADERS) | |||
| shtest: shtest.o $(UTIL_OBJS) | |||
| skinning.o: $(UTIL_HEADERS) | |||
| skinning: skinning.o $(UTIL_OBJS) | |||
| texaaline.o: $(UTIL_HEADERS) | |||
| texaaline: texaaline.o $(UTIL_OBJS) | |||
| texdemo1.o: $(UTIL_HEADERS) | |||
| texdemo1: texdemo1.o $(UTIL_OBJS) | |||
| toyball.o: $(UTIL_HEADERS) | |||
| toyball: toyball.o $(UTIL_OBJS) | |||
| twoside.o: $(UTIL_HEADERS) | |||
| twoside: twoside.o $(UTIL_OBJS) | |||
| trirast.o: $(UTIL_HEADERS) | |||
| trirast: trirast.o $(UTIL_OBJS) | |||
| vert-or-frag-only.o: $(UTIL_HEADERS) | |||
| vert-or-frag-only: vert-or-frag-only.o $(UTIL_OBJS) | |||
| vert-tex.o: $(UTIL_HEADERS) | |||
| vert-tex: vert-tex.o $(UTIL_OBJS) | |||