diff options
| author | Jouk <joukj@tarantella.nano.tudelft.nl> | 2007-10-31 08:18:58 +0100 |
|---|---|---|
| committer | Jouk <joukj@tarantella.nano.tudelft.nl> | 2007-10-31 08:18:58 +0100 |
| commit | d1414da8f9dbf3c27cf05509be51e8c70ed1185d (patch) | |
| tree | b6b3fdccea77d6173c1a829e0d2710d5b973dd5a /progs/osdemos | |
| parent | b263435a98173645fa3f4a5dce4566e53470f38f (diff) | |
| parent | d2f19a554a9089fddb5e978e3a732bbf71d77f93 (diff) | |
Merge branch 'master' of git+ssh://joukj@git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'progs/osdemos')
| -rw-r--r-- | progs/osdemos/.gitignore | 8 | ||||
| -rw-r--r-- | progs/osdemos/Makefile | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/progs/osdemos/.gitignore b/progs/osdemos/.gitignore new file mode 100644 index 0000000000..5c78f12481 --- /dev/null +++ b/progs/osdemos/.gitignore @@ -0,0 +1,8 @@ +osdemo +osdemo16 +osdemo32 +ostest1 +readtex.c +readtex.h +showbuffer.c +showbuffer.h 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 ##### |