X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=progs%2Fglsl%2FMakefile;h=6030c8002f5054dead4d3244e2969d40af97bc96;hb=0203136e69bfa711edd69a4f69c4539cd877b5cb;hp=f97cdb69429f289166652a295fb6f21027ec59f9;hpb=9038b6c8bbda49c544d777c7cf7b107887421c77;p=mesa.git

diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile
index f97cdb69429..6030c8002f5 100644
--- a/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@ -10,11 +10,15 @@ LIB_DEP = \
 	$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
 	$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
 
-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) \
+	-l$(GL_LIB) $(APP_LIB_DEPS)
 
-INCLUDE_DIRS = -I$(TOP)/progs/util
+# using : to avoid APP_CC pointing to CC loop
+CC := $(APP_CC)
+CFLAGS := -I$(INCDIR) $(CFLAGS)
+LDLIBS = $(LIBS)
 
-DEMO_SOURCES = \
+PROG_SOURCES = \
 	array.c \
 	bitmap.c \
 	brick.c \
@@ -22,6 +26,7 @@ DEMO_SOURCES = \
 	convolutions.c \
 	deriv.c \
 	fragcoord.c \
+	fsraytrace.c \
 	identity.c \
 	linktest.c \
 	mandelbrot.c \
@@ -32,7 +37,9 @@ DEMO_SOURCES = \
 	pointcoord.c \
 	points.c \
 	samplers.c \
+	samplers_array.c \
 	shadow_sampler.c \
+	shtest.c \
 	skinning.c \
 	texaaline.c \
 	texdemo1.c \
@@ -40,7 +47,8 @@ DEMO_SOURCES = \
 	trirast.c \
 	twoside.c \
 	vert-or-frag-only.c \
-	vert-tex.c
+	vert-tex.c \
+	vsraytrace.c
 
 UTIL_HEADERS = \
 	extfuncs.h \
@@ -52,28 +60,19 @@ UTIL_SOURCES = \
 	readtex.c
 
 UTIL_OBJS = $(UTIL_SOURCES:.c=.o)
+PROG_OBJS = $(PROG_SOURCES:.c=.o)
+PROGS = $(PROG_SOURCES:%.c=%)
 
+##### TARGETS #####
 
-PROGS = $(DEMO_SOURCES:%.c=%)
-
-
-
-##### RULES #####
+default: $(PROGS)
 
-# make .o file from .c file:
-.c.o:
-	$(APP_CC) -c -I$(INCDIR) $(CFLAGS) $< -o $@
+$(PROG_OBJS): $(UTIL_HEADERS)
 
+$(PROGS): $(UTIL_OBJS)
 
-# make executable from .o files
 .o:
-	$(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(UTIL_OBJS) $(LIBS) -o $@
-
-
-##### TARGETS #####
-
-default: $(PROGS)
-
+	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
 clean:
 	-rm -f $(PROGS)
@@ -83,9 +82,11 @@ clean:
 	-rm -f readtex.*
 
 
-
 ##### Extra dependencies
 
+samplers_array.o: samplers.c
+	$(APP_CC) $(CFLAGS) -DSAMPLERS_ARRAY $< -c -o $@
+
 extfuncs.h: $(TOP)/progs/util/extfuncs.h
 	cp $< .
 
@@ -101,138 +102,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)
-
-
-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)