pyrox.dev
1diff -U3 -r a/src/Config.pri b/src/Config.pri
2--- a/src/Config.pri 2008-06-06 22:08:06.000000000 +0200
3+++ b/src/Config.pri 2008-06-08 03:50:16.000000000 +0200
4@@ -80,11 +80,11 @@
5 win32:QMAKE_CXXFLAGS *= /GR /GX
6 win32:QMAKE_CFLAGS *= /GR /GX
7 irix-n32:QMAKE_CFLAGS *= -LANG:std
8-irix-n32:QMAKE_CXXFLAGS *= -LANG:std
9-linux-g++:QMAKE_CFLAGS *= -Wno-deprecated
10-linux-g++:QMAKE_CXXFLAGS *= -Wno-deprecated
11-cygwin-g++:QMAKE_CFLAGS *= -Wno-deprecated
12-cygwin-g++:QMAKE_CXXFLAGS *= -Wno-deprecated -mno-win32
13+QMAKE_CXXFLAGS *= -LANG:std
14+QMAKE_CFLAGS *= -Wno-deprecated -fPIC
15+QMAKE_CXXFLAGS *= -Wno-deprecated -fPIC
16+QMAKE_CFLAGS *= -Wno-deprecated -fPIC
17+QMAKE_CXXFLAGS *= -Wno-deprecated -fPIC
18 mac:QMAKE_CFLAGS *= -Wno-deprecated
19 mac:QMAKE_CXXFLAGS *= -Wno-deprecated
20
21diff -U3 -r a/src/geometry/Grid.h b/src/geometry/Grid.h
22--- a/src/geometry/Grid.h 2008-06-06 22:08:06.000000000 +0200
23+++ b/src/geometry/Grid.h 2008-06-06 22:05:52.000000000 +0200
24@@ -321,7 +321,7 @@
25 for (OccludersSet::iterator it = occluders.begin();
26 it != occluders.end();
27 it++) {
28- if ((unsigned)(*it)->userdata2 != _timestamp) {
29+ if ((unsigned long)(*it)->userdata2 != _timestamp) {
30 (*it)->userdata2 = (void*)_timestamp;
31 visitor.examineOccluder(*it);
32 }
33diff -U3 -r a/src/libconfig.pri b/src/libconfig.pri
34--- a/src/libconfig.pri 2008-06-06 22:08:06.000000000 +0200
35+++ b/src/libconfig.pri 2008-06-07 22:23:44.000000000 +0200
36@@ -1,110 +1,32 @@
37 # This file should be viewed as a -*- mode: Makefile -*-
38
39-contains( CONFIG, 3ds1.20 ) {
40 message ("Using 3ds 1.2.0 module")
41- linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE/LINUX
42- linux-g++:LIBS *= -L$(HOME)/LIB/LINUX -l3ds
43- cygwin-g++:INCLUDEPATH *= /usr/lib/lib3ds-1.2.0
44- cygwin-g++:LIBS *= -L/usr/lib/lib3ds-1.2.0/lib3ds -l3ds
45- mac:INCLUDEPATH *= /usr/local/include
46- mac:LIBS *= -l3ds
47- mac:QMAKE_LIBDIR *= /usr/local/lib
48- win32: INCLUDEPATH *= C:\include\lib3ds\1.2.0
49- win32: QMAKE_LIBDIR *= C:\lib\lib3ds\1.2.0
50- win32:debug: LIBS *= lib3ds-120sd.lib
51- win32:release: LIBS *= lib3ds-120s.lib
52-}
53-
54-contains( CONFIG, 3ds1.30 ) {
55- message ("Using 3ds 1.3.0 module")
56- linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE/LINUX
57- linux-g++:LIBS *= -L$(HOME)/LIB/LINUX -l3ds
58- cygwin-g++:INCLUDEPATH *= /usr/lib/lib3ds-1.3.0
59- cygwin-g++:LIBS *= -L/usr/lib/lib3ds-1.3.0/lib3ds -l3ds
60- mac:INCLUDEPATH *= /usr/local/include
61- mac:LIBS *= -l3ds
62- mac:QMAKE_LIBDIR *= /usr/local/lib
63- win32: INCLUDEPATH *= C:\include\lib3ds\1.3.0
64- win32: QMAKE_LIBDIR *= C:\lib\lib3ds\1.3.0
65- win32:debug: LIBS *= lib3ds-1_3d.lib
66- win32:release: LIBS *= lib3ds-1_3.lib
67-}
68+ INCLUDEPATH *= $(lib3ds)/include
69+ LIBS *= -L$(lib3ds)/lib -l3ds
70
71 contains( CONFIG, qglviewer ) {
72 message ("Using QGLViewer module")
73 CONFIG *= qt thread opengl glut
74- linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE
75- linux-g++:LIBS *= -L$(HOME)/LIB/LINUX -lQGLViewer
76- cygwin-g++:LIBS *= -lQGLViewer
77- win32: INCLUDEPATH *= $(HOME)\INCLUDE
78- win32: QMAKE_LIBDIR *= $(HOME)\LIB
79- win32: LIBS *= QGLViewer.lib
80+ INCLUDEPATH *= $(mesa)/include
81+ LIBS *= -L$(mesa)/lib -lQGLViewer
82+ LIBS *= -lQGLViewer
83 }
84
85-contains( CONFIG, python2.3) {
86- message ("Using python 2.3 module")
87- linux-g++:INCLUDEPATH *= /usr/include/python2.3
88- linux-g++:LIBS *= -lpthread -lm -lutil
89- linux-g++:LIBS *= -L/usr/local/lib/ -lpython2.3 -L$(HOME)/LIB/LINUX
90- win32: INCLUDEPATH *= C:\python23\include
91- win32: QMAKE_LIBDIR *= C:\python23\libs
92- win32: LIBS *= python23.lib
93-}
94-
95-contains( CONFIG, python2.4) {
96- message ("Using python 2.4 module")
97- linux-g++:INCLUDEPATH *= /usr/include/python2.4
98- linux-g++:LIBS *= -lpthread -lm -lutil
99- linux-g++:LIBS *= -L/usr/local/lib/ -lpython2.4 -L$(HOME)/LIB/LINUX
100- cygwin-g++:INCLUDEPATH *= /usr/include/python2.4
101- cygwin-g++:LIBS *= -lpthread -lm -lutil
102- cygwin-g++:LIBS *= -L/usr/lib/python2.4/config -lpython2.4
103- win32: INCLUDEPATH *= C:\python24\include
104- win32: QMAKE_LIBDIR *= C:\python24\libs
105- win32: LIBS *= python24.lib
106-}
107-
108-contains( CONFIG, python2.5) {
109- message ("Using python 2.5 module")
110- linux-g++:INCLUDEPATH *= /usr/include/python2.5
111- linux-g++:LIBS *= -lpthread -lm -lutil
112- linux-g++:LIBS *= -L/usr/local/lib/ -lpython2.5 -L$(HOME)/LIB/LINUX
113- mac: INCLUDEPATH *= /usr/include/python2.5
114- mac: LIBS *= -L/usr/lib/python2.5/config -lpython2.5
115- cygwin-g++:INCLUDEPATH *= /usr/include/python2.5
116- cygwin-g++:LIBS *= -lpthread -lm -lutil
117- cygwin-g++:LIBS *= -L/usr/lib/python2.5/config -lpython2.5
118- win32: INCLUDEPATH *= C:\python25\include
119- win32: QMAKE_LIBDIR *= C:\python25\libs
120- win32: LIBS *= python25.lib
121-}
122+message ("Using python ${PYTHON_VERSION} module")
123+INCLUDEPATH *= ${python}/include/python${PYTHON_VERSION}
124+LIBS *= -lpthread -lm -lutil
125+LIBS *= -L${python}/lib -lpython${PYTHON_VERSION} -L$(HOME)/LIB/LINUX
126
127
128 contains( CONFIG, glut) {
129 message ("Using glut module")
130- linux-g++:LIBS *= -lglut -lXi
131- cygwin-g++:LIBS *= -lglut -lXi
132- mac: LIBS *= -framework Glut
133- win32:INCLUDEPATH *= C:\include
134- win32: QMAKE_LIBDIR *= C:\lib\glut
135- win32: LIBS *= glut32.lib
136+ INCLUDEPATH *= ${freeglut}/include
137+ LIBS *= -lglut -lXi -L{freeglut}/lib
138 }
139
140 contains( CONFIG, qglviewer2 ) {
141- message ("Using QGLViewer module")
142+ MESSAGE ("Using QGLViewer module")
143 CONFIG *= qt thread opengl glut
144- linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE
145- linux-g++:LIBS *= -L$(HOME)/LIB/LINUX -lQGLViewer
146- mac: LIBS *= -lQGLViewer
147- cygwin-g++:LIBS *= -lQGLViewer2
148- win32: INCLUDEPATH *= C:\include\QGLViewer\2.2.5
149- win32{
150- release{
151- QMAKE_LIBDIR *= C:\lib\QGLViewer\release
152- }
153- debug{
154- QMAKE_LIBDIR *= C:\lib\QGLViewer\debug
155- }
156- }
157- win32: LIBS *= QGLViewer2.lib
158+ INCLUDEPATH *= $(libqglviewer)/include
159+ LIBS *= -L$(libqglviewer)/lib -lQGLViewer
160 }
161diff -U3 -r a/src/swig/Makefile b/src/swig/Makefile
162--- a/src/swig/Makefile 2008-06-06 22:08:06.000000000 +0200
163+++ b/src/swig/Makefile 2008-06-08 01:17:31.000000000 +0200
164@@ -19,14 +19,15 @@
165 LIBDIR = ../../build/${PLATEFORM}/${BUILD}/lib/python
166 IPATH = -I../geometry -I../image -I../scene_graph -I../stroke \
167 -I../system -I../view_map -I../winged_edge \
168- -I/usr/include/python${PYTHON_VERSION_MAJ}.${PYTHON_VERSION_MIN}
169+ -I${python}/include/python${PYTHON_VERSION}
170 # options to compile with static python : -lpthread -lm -lutil -shared -Xlinker -x -export-dynamic
171 #OPTI = -lpthread -lm -lutil -shared -Xlinker -x -export-dynamic #-O3 -funroll-loops -fomit-frame-pointer -ffast-math -march=i686
172 DBUG = #-ggdb #-pg
173 WARN = -w #-W -Wall #-pedantic -ansi
174
175-CFLAGS = ${OPTI} ${DBUG} ${WARN} ${IPATH}
176-LDFLAGS = ${OPTI} ${DBUG} ${WARN} ${LPATH}
177+CFLAGS = ${OPTI} ${DBUG} ${WARN} ${IPATH} -fPIC
178+LDFLAGS = ${OPTI} ${DBUG} ${WARN} ${LPATH} -L${python}/lib
179+
180
181 SWIG_SRC = Freestyle.i
182 PY_SRC = ${SWIG_SRC:.i=.py}