projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_6_branch'
[mesa.git]
/
progs
/
demos
/
Makefile
diff --git
a/progs/demos/Makefile
b/progs/demos/Makefile
index fedce1cc3d2e6255b4d5e1ade2b105e6dfaf22b2..65fdbaaad8e5d20863b924a8e8223cc37f95a10d 100644
(file)
--- a/
progs/demos/Makefile
+++ b/
progs/demos/Makefile
@@
-5,16
+5,10
@@
include $(TOP)/configs/current
INCDIR = $(TOP)/include
INCDIR = $(TOP)/include
-OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)
-
-OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS)
-
-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)
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) \
+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GL
EW_LIB) -l$(GL
U_LIB) -l$(GL_LIB) \
$(APP_LIB_DEPS)
PROGS = \
$(APP_LIB_DEPS)
PROGS = \
@@
-25,9
+19,11
@@
PROGS = \
clearspd \
copypix \
cubemap \
clearspd \
copypix \
cubemap \
+ dinoshade \
drawpix \
engine \
fbo_firecube \
drawpix \
engine \
fbo_firecube \
+ fbotexture \
fire \
fogcoord \
fplight \
fire \
fogcoord \
fplight \
@@
-38,9
+34,7
@@
PROGS = \
geartrain \
glinfo \
gloss \
geartrain \
glinfo \
gloss \
- glslnoise \
gltestperf \
gltestperf \
- glutfx \
isosurf \
ipers \
lodbias \
isosurf \
ipers \
lodbias \
@@
-48,6
+42,7
@@
PROGS = \
multiarb \
paltex \
pointblast \
multiarb \
paltex \
pointblast \
+ projtex \
rain \
ray \
readpix \
rain \
ray \
readpix \
@@
-55,7
+50,6
@@
PROGS = \
renormal \
shadowtex \
singlebuffer \
renormal \
shadowtex \
singlebuffer \
- streaming_rect \
spectex \
spriteblast \
stex3d \
spectex \
spriteblast \
stex3d \
@@
-63,9
+57,8
@@
PROGS = \
terrain \
tessdemo \
texcyl \
terrain \
tessdemo \
texcyl \
- texdown \
texenv \
texenv \
- tex
obj
\
+ tex
tures
\
trispd \
tunnel \
tunnel2 \
trispd \
tunnel \
tunnel2 \
@@
-81,7
+74,7
@@
PROGS = \
# make executable from .c file:
.c: $(LIB_DEP) readtex.o
# make executable from .c file:
.c: $(LIB_DEP) readtex.o
- $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) $< readtex.o $(LIBS) -o $@
+ $(
APP_
CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) $< readtex.o $(LIBS) -o $@
##### TARGETS #####
##### TARGETS #####
@@
-97,7
+90,7
@@
readtex.h: $(TOP)/progs/util/readtex.h
cp $< .
readtex.o: readtex.c readtex.h
cp $< .
readtex.o: readtex.c readtex.h
- $(CC) -c -I$(INCDIR) $(CFLAGS) readtex.c
+ $(
APP_
CC) -c -I$(INCDIR) $(CFLAGS) readtex.c
showbuffer.c: $(TOP)/progs/util/showbuffer.c
showbuffer.c: $(TOP)/progs/util/showbuffer.c
@@
-107,7
+100,7
@@
showbuffer.h: $(TOP)/progs/util/showbuffer.h
cp $< .
showbuffer.o: showbuffer.c showbuffer.h
cp $< .
showbuffer.o: showbuffer.c showbuffer.h
- $(CC) -c -I$(INCDIR) $(CFLAGS) showbuffer.c
+ $(
APP_
CC) -c -I$(INCDIR) $(CFLAGS) showbuffer.c
trackball.c: $(TOP)/progs/util/trackball.c
trackball.c: $(TOP)/progs/util/trackball.c
@@
-117,7
+110,7
@@
trackball.h: $(TOP)/progs/util/trackball.h
cp $< .
trackball.o: trackball.c trackball.h
cp $< .
trackball.o: trackball.c trackball.h
- $(CC) -c -I$(INCDIR) $(CFLAGS) trackball.c
+ $(
APP_
CC) -c -I$(INCDIR) $(CFLAGS) trackball.c
extfuncs.h: $(TOP)/progs/util/extfuncs.h
extfuncs.h: $(TOP)/progs/util/extfuncs.h
@@
-125,41
+118,48
@@
extfuncs.h: $(TOP)/progs/util/extfuncs.h
reflect: reflect.o showbuffer.o readtex.o
reflect: reflect.o showbuffer.o readtex.o
- $(
CC
) $(LDFLAGS) reflect.o showbuffer.o readtex.o $(LIBS) -o $@
+ $(
APP_CC) $(CFLAGS
) $(LDFLAGS) reflect.o showbuffer.o readtex.o $(LIBS) -o $@
reflect.o: reflect.c showbuffer.h
reflect.o: reflect.c showbuffer.h
- $(CC) -c -I$(INCDIR) $(CFLAGS) reflect.c
+ $(
APP_
CC) -c -I$(INCDIR) $(CFLAGS) reflect.c
shadowtex: shadowtex.o showbuffer.o
shadowtex: shadowtex.o showbuffer.o
- $(
CC
) $(LDFLAGS) shadowtex.o showbuffer.o $(LIBS) -o $@
+ $(
APP_CC) $(CFLAGS
) $(LDFLAGS) shadowtex.o showbuffer.o $(LIBS) -o $@
shadowtex.o: shadowtex.c showbuffer.h
shadowtex.o: shadowtex.c showbuffer.h
- $(CC) -c -I$(INCDIR) $(CFLAGS) shadowtex.c
+ $(
APP_
CC) -c -I$(INCDIR) $(CFLAGS) shadowtex.c
gloss: gloss.o trackball.o readtex.o
gloss: gloss.o trackball.o readtex.o
- $(
CC
) $(LDFLAGS) gloss.o trackball.o readtex.o $(LIBS) -o $@
+ $(
APP_CC) $(CFLAGS
) $(LDFLAGS) gloss.o trackball.o readtex.o $(LIBS) -o $@
gloss.o: gloss.c trackball.h
gloss.o: gloss.c trackball.h
- $(CC) -c -I$(INCDIR) $(CFLAGS) gloss.c
+ $(
APP_
CC) -c -I$(INCDIR) $(CFLAGS) gloss.c
engine: engine.o trackball.o readtex.o
engine: engine.o trackball.o readtex.o
- $(
CC
) $(LDFLAGS) engine.o trackball.o readtex.o $(LIBS) -o $@
+ $(
APP_CC) $(CFLAGS
) $(LDFLAGS) engine.o trackball.o readtex.o $(LIBS) -o $@
engine.o: engine.c trackball.h
engine.o: engine.c trackball.h
- $(CC) -c -I$(INCDIR) $(CFLAGS) engine.c
+ $(APP_CC) -c -I$(INCDIR) $(CFLAGS) engine.c
+
+
+fbotexture: fbotexture.o
+ $(APP_CC) $(CFLAGS) $(LDFLAGS) fbotexture.o $(LIBS) -o $@
+
+fbotexture.o: fbotexture.c extfuncs.h
+ $(APP_CC) -c -I$(INCDIR) $(CFLAGS) fbotexture.c
fslight: fslight.o
fslight: fslight.o
- $(
CC
) $(LDFLAGS) fslight.o $(LIBS) -o $@
+ $(
APP_CC) $(CFLAGS
) $(LDFLAGS) fslight.o $(LIBS) -o $@
fslight.o: fslight.c extfuncs.h
fslight.o: fslight.c extfuncs.h
- $(CC) -c -I$(INCDIR) $(CFLAGS) fslight.c
+ $(
APP_
CC) -c -I$(INCDIR) $(CFLAGS) fslight.c
rain: particles.o rain.o readtex.o
rain: particles.o rain.o readtex.o
- $(CXX) $(LDFLAGS) $^ $(LIBS) -o $@
+ $(CXX) $(
CXXFLAGS) $(
LDFLAGS) $^ $(LIBS) -o $@
rain.o: rain.cxx readtex.h
$(CXX) -c -I$(INCDIR) $(CXXFLAGS) $<
rain.o: rain.cxx readtex.h
$(CXX) -c -I$(INCDIR) $(CXXFLAGS) $<