Update opencv paths. Disable debug mode

pupil-labs · Dec 9, 2016 · 6e39b2f · 6e39b2f
1 parent 03b7aed
commit 6e39b2f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pupil_src/capture/pupil_detectors/setup.py b/pupil_src/capture/pupil_detectors/setup.py
@@ -46,7 +46,7 @@
     libs_2d = []
     library_dirs = []
     lib_spec = [[np.get_include(), ''],
-               ['C:\\work\\opencv3.1.0\\include', 'C:\\work\\opencv3.1.0\\build\\x64\\vc14\\lib\\opencv_world310.lib'],
+               ['C:\\work\\opencv3.1.0\\build\include', 'C:\\work\\opencv3.1.0\\build\\x64\\vc14\\lib\\opencv_world310.lib'],
                ['C:\\work\\eigen-3.2', ''],
                ['C:\\work\\ceres-windows\\ceres-solver\\include', 'C:\\work\\ceres-windows\\x64\\Release\\ceres_static.lib'],
                ['C:\\work\\ceres-windows\\glog\src\windows','C:\\work\\ceres-windows\\x64\\Release\\libglog_static.lib'],
@@ -84,8 +84,8 @@
         include_dirs = include_dirs,
         libraries = libs_2d,
         library_dirs = library_dirs,
-        extra_link_args=["-debug"], #'-WL,-R/usr/local/lib'
-        extra_compile_args=["-Zi", "/Od","-D_USE_MATH_DEFINES", "-std=c++11",'-w'],#,'-O2'], #-w hides warnings
+        extra_link_args=[], #'-WL,-R/usr/local/lib'
+        extra_compile_args=["-D_USE_MATH_DEFINES", "-std=c++11",'-w'],#,'-O2'], #-w hides warnings
         extra_objects = xtra_obj2d,
         depends= dependencies,
         language="c++"),
@@ -95,8 +95,8 @@
         include_dirs = include_dirs,
         libraries = libs_2d,
         library_dirs = library_dirs,
-        extra_link_args=["-debug"], #'-WL,-R/usr/local/lib'
-        extra_compile_args=["-Zi", "/Od","-D_USE_MATH_DEFINES","-std=c++11",'-w'],#,'-O2'], #-w hides warnings
+        extra_link_args=[], #'-WL,-R/usr/local/lib'
+        extra_compile_args=["-D_USE_MATH_DEFINES","-std=c++11",'-w'],#,'-O2'], #-w hides warnings
         extra_objects = xtra_obj2d,
         depends= dependencies,
         language="c++"),

diff --git a/pupil_src/shared_modules/calibration_routines/optimization_calibration/setup.py b/pupil_src/shared_modules/calibration_routines/optimization_calibration/setup.py
@@ -49,7 +49,7 @@
     libs = []
     library_dirs = []
     lib_spec = [[np.get_include(), ''],
-               ['C:\\work\\opencv3.1.0\\include', 'C:\\work\\opencv\\build\\x64\\vc14\\lib\\opencv_world310.lib'],
+               ['C:\\work\\opencv3.1.0\\build\\include', 'C:\\work\\opencv3.1.0\\build\\x64\\vc14\\lib\\opencv_world310.lib'],
                ['C:\\work\\eigen-3.2', ''],
                ['C:\\work\\ceres-windows\\ceres-solver\\include', 'C:\\work\\ceres-windows\\x64\\Release\\ceres_static.lib'],
                ['C:\\work\\ceres-windows\\glog\src\windows','C:\\work\\ceres-windows\\x64\\Release\\libglog_static.lib'],