summaryrefslogtreecommitdiff
path: root/progs/osdemos
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2007-10-29 09:03:01 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-10-29 09:03:01 -0600
commitc05aa5ec4cc29f949eff350582cb6f6c03dce3c6 (patch)
tree7fbd2ddd53a5eabacd35e12b407e203a7d2b2853 /progs/osdemos
parentb59dbd822f353cbf0db404f14c2721c79cde79fc (diff)
specify app lib dependencies in Makefiles (patch 1/3)
Diffstat (limited to 'progs/osdemos')
-rw-r--r--progs/osdemos/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/progs/osdemos/Makefile b/progs/osdemos/Makefile
index 7e657744e3..148d603b35 100644
--- a/progs/osdemos/Makefile
+++ b/progs/osdemos/Makefile
@@ -13,6 +13,8 @@ OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS)
LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(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)
+
PROGS = \
osdemo \
ostest1
@@ -26,7 +28,7 @@ PROGS = \
# make executable from .c file:
.c: $(LIB_DEP) readtex.o
- $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) $< readtex.o $(APP_LIB_DEPS) -o $@
+ $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) $< readtex.o $(LIBS) -o $@
##### TARGETS #####