Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 1144 → Rev 1145

/demos/trunk/orbit/makefile
12,5 → 12,5
include $(BASE)/config/example.mk
 
orbit:
make -f $(SUBMAKE) APP=orbit INIT= OTHEROBJS="initfile.o" OTHERINCL= SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=orbit INIT= OTHEROBJS="initfile.o" OTHERINCL= SHARKOPT="__OLDCHAR__ __GRX__"
 
/demos/trunk/simcity/makefile
12,4 → 12,4
include $(BASE)/config/example.mk
 
simcity:
make -f $(SUBMAKE) APP=simcity INIT= OTHEROBJS="initfile.o keyboard.o keyfunct.o tasks.o reading.o misc.o draw.o proc.o car.o" SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=simcity INIT= OTHEROBJS="initfile.o keyboard.o keyfunct.o tasks.o reading.o misc.o draw.o proc.o car.o" SHARKOPT="__OLDCHAR__ __GRX__"
/demos/trunk/mesaref/makefile
8,10 → 8,9
include $(BASE)/config/config.mk
 
PROGS = mesaref
GRAPH_DRV = svga
 
include $(BASE)/config/example.mk
 
mesaref:
make -f $(SUBMAKE) GRAPH_DRV=svga APP=mesaref INIT= OTHEROBJS="initfile.o" SHARKOPT="__OSMESA__ __PNG__ __OLDCHAR__"
make -f $(SUBMAKE) APP=mesaref INIT= OTHEROBJS="initfile.o" SHARKOPT="__OSMESA__ __PNG__ __OLDCHAR__ __SVGA__"
 
/demos/trunk/bca/makefile
12,5 → 12,5
include $(BASE)/config/example.mk
 
bca:
make -f $(SUBMAKE) APP=bca INIT= OTHEROBJS="initfile.o fab_lib.o bca_lib.o" SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=bca INIT= OTHEROBJS="initfile.o fab_lib.o bca_lib.o" SHARKOPT="__OLDCHAR__ __GRX__"
 
/demos/trunk/pngdemo/makefile
1,9 → 1,7
#
# The mpeg library
#
#
 
# (see sources for copyrights)
 
ifndef BASE
BASE=../..
endif
17,3 → 15,4
 
pngdemo:
make -f $(SUBMAKE) APP=pngdemo INIT= OTHEROBJS=$(OBJS) SHARKOPT="__PNG__ __OLDCHAR__"
 
/demos/trunk/mesatex/makefile
8,10 → 8,9
include $(BASE)/config/config.mk
 
PROGS = mesatex
GRAPH_DRV = svga
 
include $(BASE)/config/example.mk
 
mesatex:
make -f $(SUBMAKE) GRAPH_DRV=svga APP=mesatex INIT= OTHEROBJS="initfile.o" SHARKOPT="__OSMESA__ __OLDCHAR__"
make -f $(SUBMAKE) APP=mesatex INIT= OTHEROBJS="initfile.o" SHARKOPT="__OSMESA__ __OLDCHAR__ __SVGA__"
 
/demos/trunk/robots/makefile
12,5 → 12,5
include $(BASE)/config/example.mk
 
mouse2:
make -f $(SUBMAKE) APP=mouse2 INIT= OTHEROBJS="initfile.o" OTHERINCL= SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=mouse2 INIT= OTHEROBJS="initfile.o" OTHERINCL= SHARKOPT="__OLDCHAR__ __GRX__"
 
/demos/trunk/auto/control.c
21,11 → 21,11
 
/**
------------
CVS : $Id: control.c,v 1.1.1.1 2002-09-02 09:37:42 pj Exp $
CVS : $Id: control.c,v 1.2 2003-03-24 13:29:08 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.1.1.1 $
Last update: $Date: 2002-09-02 09:37:42 $
Revision: $Revision: 1.2 $
Last update: $Date: 2003-03-24 13:29:08 $
------------
**/
 
604,7 → 604,8
/* ------------------------------------------------------------------ */
 
void show_display(int rs, int ca, float speed, float max_speed,
float acc, float max_acc) {
float acc, float max_acc)
{
point hw, mx, mz; // three road states
point tl, ct, tr; // three car alignments
point sp1, sp2; // speed display coordinates
698,14 → 699,3
sem_post(&grx_mutex);
}
 
 
 
 
 
 
 
 
 
 
 
 
/demos/trunk/auto/makefile
12,12 → 12,11
include $(BASE)/config/example.mk
 
auto:
make -f $(SUBMAKE) APP=auto INIT= OTHEROBJS="initfil1.o sensor.o control.o keyb.o info.o utils.o tracks.o jetctrl.o" SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=auto INIT= OTHEROBJS="initfil1.o sensor.o control.o keyb.o info.o utils.o tracks.o jetctrl.o" SHARKOPT="__OLDCHAR__ __GRX__"
 
auto2:
make -f $(SUBMAKE) APP=auto INIT= OTHEROBJS="initfil2.o sensor.o control.o keyb.o info.o utils.o tracks.o jetctrl.o" SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=auto INIT= OTHEROBJS="initfil2.o sensor.o control.o keyb.o info.o utils.o tracks.o jetctrl.o" SHARKOPT="__OLDCHAR__ __GRX__"
 
auto3:
make -f $(SUBMAKE) APP=auto INIT= OTHEROBJS="initfil3.o sensor.o control.o keyb.o info.o utils.o tracks.o edfact.o jetctrl.o" SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=auto INIT= OTHEROBJS="initfil3.o sensor.o control.o keyb.o info.o utils.o tracks.o edfact.o jetctrl.o" SHARKOPT="__OLDCHAR__ __GRX__"
 
 
/demos/trunk/fsdemo/makefile
12,17 → 12,5
include $(BASE)/config/example.mk
 
mplay:
make -f $(SUBMAKE) APP=mplay INIT= OTHEROBJS="xread.o gclock.o gvideo.o gload.o gbuffer.o gphoto.o initfile.o" OTHERINCL="-I$(BASE)/ports" SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=mplay INIT= OTHEROBJS="xread.o gclock.o gvideo.o gload.o gbuffer.o gphoto.o initfile.o" OTHERINCL="-I$(BASE)/ports" SHARKOPT="__OLDCHAR__ __GRX__"
 
 
 
 
 
 
 
 
 
 
 
 
 
/demos/trunk/cash/makefile
13,4 → 13,5
include $(BASE)/config/example.mk
 
testcash:
make -f $(SUBMAKE) APP=testcash INIT= OTHEROBJS="initcash.o cash.o" OTHERINCL= SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=testcash INIT= OTHEROBJS="initcash.o cash.o" OTHERINCL= SHARKOPT="__OLDCHAR__ __GRX__"
 
/demos/trunk/soccer/makefile
12,6 → 12,6
include $(BASE)/config/example.mk
 
soccer:
make -f $(SUBMAKE) APP=soccer INIT= OTHEROBJS="initfile.o" SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=soccer INIT= OTHEROBJS="initfile.o" SHARKOPT="__OLDCHAR__ __GRX__"
 
 
/demos/trunk/thdemo/makefile
12,12 → 12,6
include $(BASE)/config/example.mk
 
demo:
make -f $(SUBMAKE) APP=demo INIT= OTHEROBJS="fft.o camera.o initfile.o jetctrl.o ball.o" SHARKOPT="__FFT__ __OLDCHAR__ __PXC__"
make -f $(SUBMAKE) APP=demo INIT= OTHEROBJS="fft.o camera.o initfile.o jetctrl.o ball.o" SHARKOPT="__FFT__ __OLDCHAR__ __PXC__ __GRX__"
 
 
 
 
 
 
 
 
/demos/trunk/parport/makefile
12,5 → 12,5
include $(BASE)/config/example.mk
 
ppdemo:
make -f $(SUBMAKE) APP=ppdemo INIT= OTHEROBJS="initfile.o" OTHERINCL= SHARKOPT="__OLDCHAR__ __PPORT__"
make -f $(SUBMAKE) APP=ppdemo INIT= OTHEROBJS="initfile.o" OTHERINCL= SHARKOPT="__OLDCHAR__ __PPORT__ __GRX__"
 
/demos/trunk/mesademo/makefile
8,10 → 8,9
include $(BASE)/config/config.mk
 
PROGS = mesademo
GRAPH_DRV = svga
 
include $(BASE)/config/example.mk
 
mesademo:
make -f $(SUBMAKE) GRAPH_DRV=svga APP=mesademo INIT= OTHEROBJS="initfile.o" SHARKOPT="__OSMESA__ __OLDCHAR__"
make -f $(SUBMAKE) APP=mesademo INIT= OTHEROBJS="initfile.o" SHARKOPT="__OSMESA__ __OLDCHAR__ __SVGA__"
 
/demos/trunk/lights/makefile
12,5 → 12,5
include $(BASE)/config/example.mk
 
simlight:
make -f $(SUBMAKE) APP=simlight INIT= OTHEROBJS="initfile.o " SHARKOPT="__FFT__ __OLDCHAR__"
make -f $(SUBMAKE) APP=simlight INIT= OTHEROBJS="initfile.o " SHARKOPT="__FFT__ __OLDCHAR__ __GRX__"
 
/demos/trunk/pci6025e/makefile
14,19 → 14,19
include $(BASE)/config/example.mk
 
test_dac:
make -f $(SUBMAKE) APP=test_dac OTHEROBJS=initfile.o SHARKOPT="__6025E__ __OLDCHAR__"
make -f $(SUBMAKE) APP=test_dac OTHEROBJS=initfile.o SHARKOPT="__6025E__ __OLDCHAR__ __GRX__"
wave:
make -f $(SUBMAKE) APP=wave OTHEROBJS=initfile.o SHARKOPT="__6025E__ __OLDCHAR__"
make -f $(SUBMAKE) APP=wave OTHEROBJS=initfile.o SHARKOPT="__6025E__ __OLDCHAR__ __GRX__"
test_dio:
make -f $(SUBMAKE) APP=test_dio OTHEROBJS=initfile.o SHARKOPT="__6025E__ __OLDCHAR__"
make -f $(SUBMAKE) APP=test_dio OTHEROBJS=initfile.o SHARKOPT="__6025E__ __OLDCHAR__ __GRX__"
test_ppi:
make -f $(SUBMAKE) APP=test_ppi OTHEROBJS=initfile.o SHARKOPT="__6025E__ __OLDCHAR__"
make -f $(SUBMAKE) APP=test_ppi OTHEROBJS=initfile.o SHARKOPT="__6025E__ __OLDCHAR__ __GRX__"
test_ec:
make -f $(SUBMAKE) APP=test_ec OTHEROBJS=initfile.o SHARKOPT="__6025E__ __OLDCHAR__"
make -f $(SUBMAKE) APP=test_ec OTHEROBJS=initfile.o SHARKOPT="__6025E__ __OLDCHAR__ __GRX__"
test_bec:
make -f $(SUBMAKE) APP=test_bec OTHEROBJS=initfile.o SHARKOPT="__6025E__ __OLDCHAR__"
make -f $(SUBMAKE) APP=test_bec OTHEROBJS=initfile.o SHARKOPT="__6025E__ __OLDCHAR__ __GRX__"
test_mes:
make -f $(SUBMAKE) APP=test_mes OTHEROBJS=initfile.o SHARKOPT="__6025E__ __OLDCHAR__"
make -f $(SUBMAKE) APP=test_mes OTHEROBJS=initfile.o SHARKOPT="__6025E__ __OLDCHAR__ __GRX__"
test_bms:
make -f $(SUBMAKE) APP=test_bms OTHEROBJS=initfile.o SHARKOPT="__6025E__ __OLDCHAR__"
make -f $(SUBMAKE) APP=test_bms OTHEROBJS=initfile.o SHARKOPT="__6025E__ __OLDCHAR__ __GRX__"
 
/demos/trunk/mix/makefile
12,5 → 12,5
include $(BASE)/config/example.mk
 
mix:
make -f $(SUBMAKE) APP=mix INIT= OTHEROBJS="initfile.o" OTHERINCL= SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=mix INIT= OTHEROBJS="initfile.o" OTHERINCL= SHARKOPT="__OLDCHAR__ __GRX__"
 
/demos/trunk/cbs_ft/makefile
12,6 → 12,6
include $(BASE)/config/example.mk
 
prova:
make -f $(SUBMAKE) APP=prova INIT= OTHEROBJS="initfile.o cbs_ft.o" OTHERINCL= SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=prova INIT= OTHEROBJS="initfile.o cbs_ft.o" OTHERINCL= SHARKOPT="__OLDCHAR__ __GRX__"
 
 
/demos/trunk/svgademo/makefile
8,10 → 8,9
include $(BASE)/config/config.mk
 
PROGS = svgademo
GRAPH_DRV = svga
 
include $(BASE)/config/example.mk
 
svgademo:
make -f $(SUBMAKE) GRAPH_DRV=svga APP=svgademo INIT= OTHEROBJS="initfile.o" OTHERINCL= SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=svgademo INIT= OTHEROBJS="initfile.o" OTHERINCL= SHARKOPT="__OLDCHAR__ __SVGA__"
 
/demos/trunk/jumpball/makefile
12,8 → 12,8
include $(BASE)/config/example.mk
 
demo:
make -f $(SUBMAKE) APP=demo INIT= OTHEROBJS="initfil1.o ball.o jetctrl.o" OTHERINCL= SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=demo INIT= OTHEROBJS="initfil1.o ball.o jetctrl.o" OTHERINCL= SHARKOPT="__OLDCHAR__ __GRX__"
 
demo2:
make -f $(SUBMAKE) APP=demo INIT= OTHEROBJS="initfil2.o ball.o jetctrl.o" OTHERINCL= SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=demo INIT= OTHEROBJS="initfil2.o ball.o jetctrl.o" OTHERINCL= SHARKOPT="__OLDCHAR__ __GRX__"
 
/demos/trunk/eli/makefile
12,5 → 12,5
include $(BASE)/config/example.mk
 
eli:
make -f $(SUBMAKE) APP=eli INIT= OTHEROBJS="initfile.o draw.o" OTHERINCL= SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=eli INIT= OTHEROBJS="initfile.o draw.o" OTHERINCL= SHARKOPT="__OLDCHAR__ __GRX__"
 
/demos/trunk/mpeg2/makefile
16,4 → 16,4
OBJS= "initfile.o jetctrl.o getpic.o motion.o getvlc.o gethdr.o getblk.o getbits.o store.o recon.o spatscal.o idct.o idctref.o systems.o subspic.o verify.o gvideo.o"
 
mpeg2dec:
make -f $(SUBMAKE) APP=mpeg2dec INIT= OTHEROBJS=$(OBJS) OTHERINCL= SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=mpeg2dec INIT= OTHEROBJS=$(OBJS) OTHERINCL= SHARKOPT="__OLDCHAR__ __GRX__"
/demos/trunk/base/makefile
98,13 → 98,14
# Graphical applications
 
ego:
make -f $(SUBMAKE) APP=ego INIT= OTHEROBJS="initfile.o" OTHERINCL= SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=ego INIT= OTHEROBJS="initfile.o" OTHERINCL= SHARKOPT="__OLDCHAR__ __GRX__"
 
fly:
make -f $(SUBMAKE) APP=fly INIT= OTHEROBJS="initfile.o" OTHERINCL= SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=fly INIT= OTHEROBJS="initfile.o" OTHERINCL= SHARKOPT="__OLDCHAR__ __GRX__"
 
cabs:
make -f $(SUBMAKE) APP=cabs INIT= OTHEROBJS="initfile.o" OTHERINCL= SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=cabs INIT= OTHEROBJS="initfile.o" OTHERINCL= SHARKOPT="__OLDCHAR__ __GRX__"
 
sched:
make -f $(SUBMAKE) APP=sched INIT= OTHEROBJS="isched.o" OTHERINCL= SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=sched INIT= OTHEROBJS="isched.o" OTHERINCL= SHARKOPT="__OLDCHAR__ __GRX__"
 
/demos/trunk/kalm3d/makefile
8,10 → 8,9
include $(BASE)/config/config.mk
 
PROGS = kalm3d
GRAPH_DRV = svga
 
include $(BASE)/config/example.mk
 
kalm3d:
make -f $(SUBMAKE) GRAPH_DRV=svga APP=kalm3d INIT= OTHEROBJS="initfile.o carrello.o" SHARKOPT="__OSMESA__ __PCLAB__ __OLDCHAR__"
make -f $(SUBMAKE) APP=kalm3d INIT= OTHEROBJS="initfile.o carrello.o" SHARKOPT="__OSMESA__ __PCLAB__ __OLDCHAR__ __SVGA__"