Attachment #183266 for bug #260383

View | Details | Raw Unified | Return to bug 260383
Collapse All | Expand All

Lines 26-32 Link Here

(-)pyrobot/brain/psom/csom_src/makefile (-1 / +1 lines)
26	#statically linked one. -- WKV 2003-07-28	26	#statically linked one. -- WKV 2003-07-28
27	#LD=ld	27	#LD=ld
28	LD=$(CC)	28	LD=$(CC)
29	CC_FLAGS=-c -g -I $(PYTHON_INCLUDE)	29	CC_FLAGS=-fPIC -c -g -I $(PYTHON_INCLUDE)
30	SWIG_FLAGS=-python	30	SWIG_FLAGS=-python
31	LD_FLAGS=-shared	31	LD_FLAGS=-shared
32		32

Lines 2-8 Link Here

(-)pyrobot/brain/psom/csom_src/som_pak-dev/makefile (-1 / +1 lines)
2	include ../../../../Makefile.src	2	include ../../../../Makefile.src
3		3
4	CC=cc	4	CC=cc
5	CFLAGS=-O $(PYTHON_INCLUDE)	5	CFLAGS=-fPIC -O $(PYTHON_INCLUDE)
6	LDFLAGS=-s	6	LDFLAGS=-s
7	LDLIBS=-lm	7	LDLIBS=-lm
8	LD=$(CC)	8	LD=$(CC)




	-D_REENTRANT -DPOSIX \
	-D__x86__ -D__linux__ \
	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \
	-fPIC \
	$(PYTHON_INCLUDE) $(INCLUDE)

LIBDIRS= 

	$(CC) $(CPPFLAGS) -shared aibo.o Aibo.o Socket.o jpeg.o RWLock.o ../device/Device.o $(LIBDIRS) -o $@ $(LIBS)

RWLock.o: RWLock.cpp RWLock.h
	$(CC) $(CPPFLAGS) RWLock.cpp -c

jpeg.o: jpeg.c jpeg.h
	$(CC) $(CPPFLAGS) jpeg.c -c

Aibo.o: Aibo.cpp Aibo.h ../device/Device.o
	$(CC) $(CPPFLAGS) -o $@ -c Aibo.cpp

	swig -python -c++ $(INCLUDE) -o Aibo.cc Aibo.i

aibo.o: Aibo.cc 
	$(CC) $(CPPFLAGS) -c $(PYTHON_INCLUDE) $(INCLUDE) Aibo.cc -o $@

Socket.o: Socket.cpp Socket.h
	$(CC) $(CPPFLAGS) -c $(PYTHON_INCLUDE) $(INCLUDE) Socket.cpp -o $@

clean::
	$(RM) *~ *.so *.o Aibo.cc aibo.py

Lines 9-14 Link Here

(-)pyrobot/camera/blob/Makefile (-1 / +2 lines)
9	-D_REENTRANT -DPOSIX \	9	-D_REENTRANT -DPOSIX \
10	-D__x86__ -D__linux__ \	10	-D__x86__ -D__linux__ \
11	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \	11	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \
		12	-fPIC \
12	$(PYTHON_INCLUDE) $(INCLUDE)	13	$(PYTHON_INCLUDE) $(INCLUDE)
13		14
14	LIBDIRS=	15	LIBDIRS=
Lines 27-33 Link Here
27	swig -python -c++ $(INCLUDE) -o Blob.cc Blob.i	28	swig -python -c++ $(INCLUDE) -o Blob.cc Blob.i
28		29
29	blob.o: Blob.cc	30	blob.o: Blob.cc
30	$(CC) -c $(PYTHON_INCLUDE) $(INCLUDE) Blob.cc -o $@	31	$(CC) $(CPPFLAGS) -c $(PYTHON_INCLUDE) $(INCLUDE) Blob.cc -o $@
31		32
32	clean::	33	clean::
33	$(RM) ~ .so *.o Blob.cc blob.py	34	$(RM) ~ .so *.o Blob.cc blob.py

Lines 9-14 Link Here

(-)pyrobot/camera/bt848/Makefile (-1 / +2 lines)
9	-D_REENTRANT -DPOSIX \	9	-D_REENTRANT -DPOSIX \
10	-D__x86__ -D__linux__ \	10	-D__x86__ -D__linux__ \
11	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \	11	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \
		12	-fPIC \
12	$(PYTHON_INCLUDE)	13	$(PYTHON_INCLUDE)
13		14
14	LIBDIRS=	15	LIBDIRS=
Lines 24-30 Link Here
24	swig -python $(INCLUDE) -c++ -o $@ BT848.i	25	swig -python $(INCLUDE) -c++ -o $@ BT848.i
25		26
26	bt848.o: BT848.cc ../device/Device.o	27	bt848.o: BT848.cc ../device/Device.o
27	$(CC) -c $(PYTHON_INCLUDE) $(INCLUDE) BT848.cc -o $@	28	$(CC) $(CPPFLAGS) -c $(PYTHON_INCLUDE) $(INCLUDE) BT848.cc -o $@
28		29
29	clean::	30	clean::
30	$(RM) ~ BT848.cc bt848.py bt848.cc bt848grab .so *.o	31	$(RM) ~ BT848.cc bt848.py bt848.cc bt848grab .so *.o

Lines 9-16 Link Here

(-)pyrobot/camera/device/Makefile (+4 lines)
9	-D_REENTRANT -DPOSIX \	9	-D_REENTRANT -DPOSIX \
10	-D__x86__ -D__linux__ \	10	-D__x86__ -D__linux__ \
11	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \	11	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \
		12	-fPIC \
12	$(PYTHON_INCLUDE) -shared	13	$(PYTHON_INCLUDE) -shared
13		14
		15	Device.o:: Device.cpp Device.h
		16	$(CC) $(CPPFLAGS) -o $@ -c $<
		17
14	clean::	18	clean::
15	$(RM) ~ .so *.o	19	$(RM) ~ .so *.o
16		20

Lines 9-14 Link Here

(-)pyrobot/camera/fake/Makefile (-1 / +2 lines)
9	-D_REENTRANT -DPOSIX \	9	-D_REENTRANT -DPOSIX \
10	-D__x86__ -D__linux__ \	10	-D__x86__ -D__linux__ \
11	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \	11	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \
		12	-fPIC \
12	$(PYTHON_INCLUDE) $(INCLUDE)	13	$(PYTHON_INCLUDE) $(INCLUDE)
13		14
14	LIBS= -lstdc++ -ldl -lpthread	15	LIBS= -lstdc++ -ldl -lpthread
Lines 26-32 Link Here
26	swig -python -c++ $(INCLUDE) -o Fake.cc Fake.i	27	swig -python -c++ $(INCLUDE) -o Fake.cc Fake.i
27		28
28	fake.o: Fake.cc	29	fake.o: Fake.cc
29	$(CC) -c $(PYTHON_INCLUDE) $(INCLUDE) Fake.cc -o $@	30	$(CC) $(CPPFLAGS) -c $(PYTHON_INCLUDE) $(INCLUDE) Fake.cc -o $@
30		31
31	clean::	32	clean::
32	$(RM) ~ .so *.o fake.py Fake.cc	33	$(RM) ~ .so *.o fake.py Fake.cc

Lines 9-14 Link Here

(-)pyrobot/camera/fourway/Makefile (-1 / +2 lines)
9	-D_REENTRANT -DPOSIX \	9	-D_REENTRANT -DPOSIX \
10	-D__x86__ -D__linux__ \	10	-D__x86__ -D__linux__ \
11	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \	11	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \
		12	-fPIC \
12	$(PYTHON_INCLUDE) $(INCLUDE)	13	$(PYTHON_INCLUDE) $(INCLUDE)
13		14
14	LIBS= -lstdc++ -ldl -lpthread	15	LIBS= -lstdc++ -ldl -lpthread
Lines 26-32 Link Here
26	swig -python -c++ $(INCLUDE) -o Fourway.cc Fourway.i	27	swig -python -c++ $(INCLUDE) -o Fourway.cc Fourway.i
27		28
28	fourway.o: Fourway.cc	29	fourway.o: Fourway.cc
29	$(CC) -c $(PYTHON_INCLUDE) $(INCLUDE) Fourway.cc -o $@	30	$(CC) $(CPPFLAGS) -c $(PYTHON_INCLUDE) $(INCLUDE) Fourway.cc -o $@
30		31
31	clean::	32	clean::
32	$(RM) ~ .so *.o fourway.py Fourway.cc	33	$(RM) ~ .so *.o fourway.py Fourway.cc

Lines 9-14 Link Here

(-)pyrobot/camera/player/Makefile (-1 / +2 lines)
9	-D_REENTRANT -DPOSIX \	9	-D_REENTRANT -DPOSIX \
10	-D__x86__ -D__linux__ \	10	-D__x86__ -D__linux__ \
11	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \	11	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \
		12	-fPIC \
12	$(PYTHON_INCLUDE) $(INCLUDE)	13	$(PYTHON_INCLUDE) $(INCLUDE)
13		14
14	LIBS= -lstdc++ -ldl -L/usr/local/lib -L/usr/lib -lpthread -lplayerc -ljpeg	15	LIBS= -lstdc++ -ldl -L/usr/local/lib -L/usr/lib -lpthread -lplayerc -ljpeg
Lines 26-32 Link Here
26	swig -python -c++ $(INCLUDE) -o PlayerCam.cc PlayerCam.i	27	swig -python -c++ $(INCLUDE) -o PlayerCam.cc PlayerCam.i
27		28
28	playercam.o: PlayerCam.cc	29	playercam.o: PlayerCam.cc
29	$(CC) -c $(PYTHON_INCLUDE) $(INCLUDE) PlayerCam.cc -o $@	30	$(CC) $(CPPFLAGS) -c $(PYTHON_INCLUDE) $(INCLUDE) PlayerCam.cc -o $@
30		31
31	clean::	32	clean::
32	$(RM) ~ .so *.o PlayerCam.cc playercam.py	33	$(RM) ~ .so *.o PlayerCam.cc playercam.py

Lines 9-14 Link Here

(-)pyrobot/camera/robocup/Makefile (-1 / +2 lines)
9	-D_REENTRANT -DPOSIX \	9	-D_REENTRANT -DPOSIX \
10	-D__x86__ -D__linux__ \	10	-D__x86__ -D__linux__ \
11	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \	11	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \
		12	-fPIC \
12	$(PYTHON_INCLUDE) $(INCLUDE)	13	$(PYTHON_INCLUDE) $(INCLUDE)
13		14
14	LIBDIRS=	15	LIBDIRS=
Lines 27-33 Link Here
27	swig -python -c++ $(INCLUDE) -o Robocup.cc Robocup.i	28	swig -python -c++ $(INCLUDE) -o Robocup.cc Robocup.i
28		29
29	robocup.o: Robocup.cc	30	robocup.o: Robocup.cc
30	$(CC) -c $(PYTHON_INCLUDE) $(INCLUDE) Robocup.cc -o $@	31	$(CC) $(CPPFLAGS) -c $(PYTHON_INCLUDE) $(INCLUDE) Robocup.cc -o $@
31		32
32	clean::	33	clean::
33	$(RM) ~ .so *.o Robocup.cc robocup.py	34	$(RM) ~ .so *.o Robocup.cc robocup.py

Lines 96-102 Link Here

(-)pyrobot/camera/robocup/Robocup.cpp (-1 / +2 lines)
96	// ]	96	// ]
97	// draw points	97	// draw points
98	PyObject key, value;	98	PyObject key, value;
99	int next = 0;	99	/int next = 0;/
		100	Py_ssize_t next = 0;
100	int lastX, lastY;	101	int lastX, lastY;
101	while (PyDict_Next(points, &next, &key, &value)) { // for each line	102	while (PyDict_Next(points, &next, &key, &value)) { // for each line
102	// key is the name of the line	103	// key is the name of the line

Lines 10-15 Link Here

(-)pyrobot/camera/stereo/Makefile (-1 / +2 lines)
10	-D_REENTRANT -DPOSIX \	10	-D_REENTRANT -DPOSIX \
11	-D__x86__ -D__linux__ \	11	-D__x86__ -D__linux__ \
12	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \	12	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \
		13	-fPIC \
13	$(PYTHON_INCLUDE) $(INCLUDE)	14	$(PYTHON_INCLUDE) $(INCLUDE)
14		15
15	LIBS= -lstdc++ -ldl -lpthread	16	LIBS= -lstdc++ -ldl -lpthread
Lines 27-33 Link Here
27	swig -python -c++ $(INCLUDE) -o Stereo.cc Stereo.i	28	swig -python -c++ $(INCLUDE) -o Stereo.cc Stereo.i
28		29
29	stereo.o: Stereo.cc	30	stereo.o: Stereo.cc
30	$(CC) -c $(PYTHON_INCLUDE) $(INCLUDE) Stereo.cc -o $@	31	$(CC) $(CPPFLAGS) -c $(PYTHON_INCLUDE) $(INCLUDE) Stereo.cc -o $@
31		32
32	clean::	33	clean::
33	$(RM) ~ .so *.o stereo.py Stereo.cc p2p	34	$(RM) ~ .so *.o stereo.py Stereo.cc p2p

Lines 10-15 Link Here

(-)pyrobot/camera/v4l/Makefile (-1 / +2 lines)
10	-D_REENTRANT -DPOSIX \	10	-D_REENTRANT -DPOSIX \
11	-D__x86__ -D__linux__ \	11	-D__x86__ -D__linux__ \
12	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \	12	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \
		13	-fPIC \
13	$(PYTHON_INCLUDE)	14	$(PYTHON_INCLUDE)
14		15
15	LIBDIRS=	16	LIBDIRS=
Lines 25-31 Link Here
25	swig -python $(INCLUDE) -c++ -o $@ V4L.i	26	swig -python $(INCLUDE) -c++ -o $@ V4L.i
26		27
27	v4l.o: V4L.cc ../device/Device.o	28	v4l.o: V4L.cc ../device/Device.o
28	$(CC) -c $(PYTHON_INCLUDE) $(INCLUDE) V4L.cc -o $@	29	$(CC) $(CPPFLAGS) -c $(PYTHON_INCLUDE) $(INCLUDE) V4L.cc -o $@
29		30
30	clean::	31	clean::
31	$(RM) ~ .so *.o v4l.py V4L.cc	32	$(RM) ~ .so *.o v4l.py V4L.cc

Lines 136-142 Link Here

(-)pyrobot/camera/v4l/V4L.cpp (-1 / +2 lines)
136	MAP_SHARED,	136	MAP_SHARED,
137	grab_fd,	137	grab_fd,
138	0);	138	0);
139	if ((int)image == -1) {	139	/if ((int)image == -1) {/
		140	if ((void )image == (void ) MAP_FAILED) {
140	fprintf(stderr,"Error ");	141	fprintf(stderr,"Error ");
141	perror("mmap");	142	perror("mmap");
142	exit(1);	143	exit(1);

Lines 10-15 Link Here

(-)pyrobot/vision/cvision/Makefile (-1 / +2 lines)
10	-D_REENTRANT -DPOSIX \	10	-D_REENTRANT -DPOSIX \
11	-D__x86__ -D__linux__ \	11	-D__x86__ -D__linux__ \
12	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \	12	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \
		13	-fPIC \
13	$(PYTHON_INCLUDE) $(INCLUDE)	14	$(PYTHON_INCLUDE) $(INCLUDE)
14		15
15	LIBS= -lstdc++ -ldl -lpthread	16	LIBS= -lstdc++ -ldl -lpthread
Lines 24-30 Link Here
24	swig $(INCLUDE) -python -c++ -o $@ Vision.i	25	swig $(INCLUDE) -python -c++ -o $@ Vision.i
25		26
26	vision.o: Vision.cc	27	vision.o: Vision.cc
27	$(CC) -c $(PYTHON_INCLUDE) $(INCLUDE) $^ -o $@	28	$(CC) $(CPPFLAGS) -c $(PYTHON_INCLUDE) $(INCLUDE) $^ -o $@
28		29
29	clean::	30	clean::
30	$(RM) ~ .so .o .cc .so .pyc vision.py	31	$(RM) ~ .so .o .cc .so .pyc vision.py

Return to bug 260383

Lines 9-14 Link Here

(-)pyrobot/camera/aibo/Makefile (-4 / +5 lines)
9	-D_REENTRANT -DPOSIX \	9	-D_REENTRANT -DPOSIX \
10	-D__x86__ -D__linux__ \	10	-D__x86__ -D__linux__ \
11	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \	11	-D__OSVERSION__=2 -frepo -DUSINGTHREADS -DLINUX -D_GNU_SOURCE \
		12	-fPIC \
12	$(PYTHON_INCLUDE) $(INCLUDE)	13	$(PYTHON_INCLUDE) $(INCLUDE)
13		14
14	LIBDIRS=	15	LIBDIRS=
Lines 21-30 Link Here
21	$(CC) $(CPPFLAGS) -shared aibo.o Aibo.o Socket.o jpeg.o RWLock.o ../device/Device.o $(LIBDIRS) -o $@ $(LIBS)	22	$(CC) $(CPPFLAGS) -shared aibo.o Aibo.o Socket.o jpeg.o RWLock.o ../device/Device.o $(LIBDIRS) -o $@ $(LIBS)
22		23
23	RWLock.o: RWLock.cpp RWLock.h	24	RWLock.o: RWLock.cpp RWLock.h
24	$(CC) RWLock.cpp -c	25	$(CC) $(CPPFLAGS) RWLock.cpp -c
25		26
26	jpeg.o: jpeg.c jpeg.h	27	jpeg.o: jpeg.c jpeg.h
27	$(CC) jpeg.c -c	28	$(CC) $(CPPFLAGS) jpeg.c -c
28		29
29	Aibo.o: Aibo.cpp Aibo.h ../device/Device.o	30	Aibo.o: Aibo.cpp Aibo.h ../device/Device.o
30	$(CC) $(CPPFLAGS) -o $@ -c Aibo.cpp	31	$(CC) $(CPPFLAGS) -o $@ -c Aibo.cpp
Lines 33-42 Link Here
33	swig -python -c++ $(INCLUDE) -o Aibo.cc Aibo.i	34	swig -python -c++ $(INCLUDE) -o Aibo.cc Aibo.i
34		35
35	aibo.o: Aibo.cc	36	aibo.o: Aibo.cc
36	$(CC) -c $(PYTHON_INCLUDE) $(INCLUDE) Aibo.cc -o $@	37	$(CC) $(CPPFLAGS) -c $(PYTHON_INCLUDE) $(INCLUDE) Aibo.cc -o $@
37		38
38	Socket.o: Socket.cpp Socket.h	39	Socket.o: Socket.cpp Socket.h
39	$(CC) -c $(PYTHON_INCLUDE) $(INCLUDE) Socket.cpp -o $@	40	$(CC) $(CPPFLAGS) -c $(PYTHON_INCLUDE) $(INCLUDE) Socket.cpp -o $@
40		41
41	clean::	42	clean::
42	$(RM) ~ .so *.o Aibo.cc aibo.py	43	$(RM) ~ .so *.o Aibo.cc aibo.py