Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpgperui <pgperui@65703dd9-322d-4ecd-a169-f49c4620ba53>2011-05-20 22:22:42 (GMT)
committer pgperui <pgperui@65703dd9-322d-4ecd-a169-f49c4620ba53>2011-05-20 22:22:42 (GMT)
commit40ce6c1d7b3184249bf8a86e03ad14e6bb5f7dd3 (patch)
tree55a44e5a4441db99d3115d06a7203e323b8c5d50
parent6834dcc9d2cbe24ed715c2b4a816235d641c1bf3 (diff)
git-svn-id: svn+ssh://lulu.fing.edu.uy/ens/home01/pgperui/repoSVN@173 65703dd9-322d-4ecd-a169-f49c4620ba53
-rw-r--r--Utilidades/src/MakefilePython2
-rw-r--r--Utilidades/src/MakefilePythonXO2
-rw-r--r--Utilidades/src/MakefileXO3
3 files changed, 4 insertions, 3 deletions
diff --git a/Utilidades/src/MakefilePython b/Utilidades/src/MakefilePython
index fc0d1e8..b0d30c7 100644
--- a/Utilidades/src/MakefilePython
+++ b/Utilidades/src/MakefilePython
@@ -12,4 +12,4 @@ PuiModule.so: Pui.o Pui_wrap.o
g++ -shared Pui.o Pui_wrap.o -lstdc++ -pthread -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lxml2 -lglib-2.0 -L/usr/X11R6/lib -L/usr/local/lib -L../../ARToolkit/lib/ -L../../Utilidades/src -lARgsub -lARgsub_lite -lARvideo -lARMulti -lAR -lpthread -lglut -lGLU -lGL -lXi -lX11 -lm -lXmu -lcv -lcvaux cvUtilities.o Funciones.o TimeUtils.o -o _PuiModule.so
clean:
- rm Pui.o Pui_wrap.* _PuiModule.so \ No newline at end of file
+ rm Pui.o Pui_wrap.* _PuiModule.so
diff --git a/Utilidades/src/MakefilePythonXO b/Utilidades/src/MakefilePythonXO
index bbef2b1..fe473dd 100644
--- a/Utilidades/src/MakefilePythonXO
+++ b/Utilidades/src/MakefilePythonXO
@@ -1,6 +1,6 @@
SWIG=/usr/bin/swig
-CFLAGS=-DRELEASE -fpic -pipe -O2 -march=native -mtune=native -msse -msse2 -msse3 -mmmx -m3dnow -pthread -I/usr/include/gstreamer-0.10 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I/usr/X11R6/include -I/usr/include/opencv -I../../ARToolkit/include -DGLUT_HABILITADO=1 -I/usr/include/python2.5 -I/usr/lib/python2.5/site-packages/numpy/core/include
+CFLAGS=-DRELEASE -fpic -pipe -O2 -pthread -I/usr/include/gstreamer-0.10 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I/usr/X11R6/include -I/usr/include/opencv -I../../ARToolkit/include -DGLUT_HABILITADO=1 -I/usr/include/python2.5 -I/usr/lib/python2.5/site-packages/numpy/core/include
all: PuiModule.so
diff --git a/Utilidades/src/MakefileXO b/Utilidades/src/MakefileXO
index a3a2fdd..b3036a3 100644
--- a/Utilidades/src/MakefileXO
+++ b/Utilidades/src/MakefileXO
@@ -9,7 +9,8 @@ LIBS= -lARgsub -lARvideo -lARMulti -lAR -lpthread -lglut -lGLU -lGL -lXi -lX11 -
CFLAG_RELEASE_AGGRESIVE = -pipe -O2 -ffast-math -funroll-all-loops -march=native -mtune=native -msse -msse2 -msse3 -mmmx -m3dnow -pthread -I/usr/include/gstreamer-0.10 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I/usr/X11R6/include -I/usr/include/opencv -I$(INC_DIR)
#CFLAG_RELEASE incluye todas las banderas de optimizacion menos -funroll-all-loops
-CFLAG_RELEASE = -fPIC -pipe -O2 -march=native -mtune=native -msse -msse2 -msse3 -mmmx -m3dnow -pthread -I/usr/include/gstreamer-0.10 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I/usr/X11R6/include -I/usr/include/opencv -I$(INC_DIR)
+#CFLAG_RELEASE = -fPIC -pipe -O2 -march=native -mtune=native -msse -msse2 -msse3 -mmmx -m3dnow -pthread -I/usr/include/gstreamer-0.10 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I/usr/X11R6/include -I/usr/include/opencv -I$(INC_DIR)
+CFLAG_RELEASE = -fPIC -pipe -O2 -pthread -I/usr/include/gstreamer-0.10 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I/usr/X11R6/include -I/usr/include/opencv -I$(INC_DIR)
#Banderas para debug, no optimizan (compilacion mas rapida) y generan simbolos de debug
CFLAG_DEBUG = -pipe -g -O0 -fPIC -pthread -I/usr/include/gstreamer-0.10 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I/usr/X11R6/include -I/usr/include/opencv -I$(INC_DIR)