progs/glsl: minor Makefile clean-ups
(cherry picked from commit 4df2f7af5e
)
This commit is contained in:
@@ -10,16 +10,15 @@ LIB_DEP = \
|
|||||||
$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
|
$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
|
||||||
$(TOP)/$(LIB_DIR)/$(GLUT_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)
|
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
|
# using : to avoid APP_CC pointing to CC loop
|
||||||
CC:=$(APP_CC)
|
CC := $(APP_CC)
|
||||||
CFLAGS += -I$(INCDIR)
|
CFLAGS += -I$(INCDIR)
|
||||||
LDLIBS=$(LIBS)
|
LDLIBS = $(LIBS)
|
||||||
|
|
||||||
DEMO_SOURCES = \
|
PROG_SOURCES = \
|
||||||
array.c \
|
array.c \
|
||||||
bitmap.c \
|
bitmap.c \
|
||||||
brick.c \
|
brick.c \
|
||||||
@@ -59,8 +58,8 @@ UTIL_SOURCES = \
|
|||||||
readtex.c
|
readtex.c
|
||||||
|
|
||||||
UTIL_OBJS = $(UTIL_SOURCES:.c=.o)
|
UTIL_OBJS = $(UTIL_SOURCES:.c=.o)
|
||||||
PROG_OBJS = $(DEMO_SOURCES:.c=.o)
|
PROG_OBJS = $(PROG_SOURCES:.c=.o)
|
||||||
PROGS = $(DEMO_SOURCES:%.c=%)
|
PROGS = $(PROG_SOURCES:%.c=%)
|
||||||
|
|
||||||
##### TARGETS #####
|
##### TARGETS #####
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user