progs/egl: Port ES1 gears to eglut.

[mesa.git] / progs / glsl / Makefile

diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile
index 8103a5cbca0f046e10b8b4716e550b572401a3fe..6030c8002f5054dead4d3244e2969d40af97bc96 100644 (file)
--- a/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@ -10,16 +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$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
-
-INCLUDE_DIRS = -I$(TOP)/progs/util
+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) \
+       -l$(GL_LIB) $(APP_LIB_DEPS)
 
 # using : to avoid APP_CC pointing to CC loop
-CC:=$(APP_CC)
-CFLAGS += -I$(INCDIR)
-LDLIBS=$(LIBS)
+CC := $(APP_CC)
+CFLAGS := -I$(INCDIR) $(CFLAGS)
+LDLIBS = $(LIBS)
 
-DEMO_SOURCES = \
+PROG_SOURCES = \
        array.c \
        bitmap.c \
        brick.c \
@@ -27,6 +26,7 @@ DEMO_SOURCES = \
        convolutions.c \
        deriv.c \
        fragcoord.c \
+       fsraytrace.c \
        identity.c \
        linktest.c \
        mandelbrot.c \
@@ -47,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 \
@@ -59,8 +60,8 @@ UTIL_SOURCES = \
        readtex.c
 
 UTIL_OBJS = $(UTIL_SOURCES:.c=.o)
-PROG_OBJS = $(DEMO_SOURCES:.c=.o)
-PROGS = $(DEMO_SOURCES:%.c=%)
+PROG_OBJS = $(PROG_SOURCES:.c=.o)
+PROGS = $(PROG_SOURCES:%.c=%)
 
 ##### TARGETS #####
 
@@ -70,6 +71,9 @@ $(PROG_OBJS): $(UTIL_HEADERS)
 
 $(PROGS): $(UTIL_OBJS)
 
+.o:
+       $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
+
 clean:
        -rm -f $(PROGS)
        -rm -f *.o *~