Don't need to block multiple thread access. Refactor and update a bit for an upcoming...

[zxing.git] / cpp / SConscript

diff --git a/cpp/SConscript b/cpp/SConscript
index d324545..fd03b3d 100644 (file)
--- a/cpp/SConscript
+++ b/cpp/SConscript
@@ -1,13 +1,21 @@
 Decider('MD5')\r
 \r
-env = Environment()\r
+vars = Variables()\r
+vars.Add(BoolVariable('DEBUG', 'Set to disable optimizations', 1))\r
+vars.Add(BoolVariable('PIC', 'Set to 1 for to always generate PIC code', 0))\r
+env = Environment(variables = vars)\r
 \r
-debug = True\r
+debug = env['DEBUG']\r
 compile_options = {}\r
 flags = []\r
 if debug:\r
        #compile_options['CPPDEFINES'] = "-DDEBUG"\r
-       flags.append("-O0 -g3 -Wall")\r
+       flags.append("-O0 -g3 -ggdb -Wall")\r
+else:\r
+       flags.append("-O -g3 -Wall")\r
+if env['PIC']:\r
+       flags.append("-fPIC")\r
+\r
 compile_options['CXXFLAGS'] = ' '.join(flags)\r
 \r
 \r
@@ -29,7 +37,7 @@ zxing_files = all_files('core/src')
 zxing_include = ['core/src']\r
 zxing_libs = env.Library('zxing', source=zxing_files, CPPPATH=zxing_include, **compile_options)\r
 \r
-app_files = all_files('magick/src')\r
+app_files = ['magick/src/MagickBitmapSource.cpp', 'magick/src/main.cpp']\r
 app_executable = env.Program('zxing', app_files, CPPPATH=magick_include + zxing_include, LIBS=magick_libs + zxing_libs, **compile_options)\r
 \r
 test_files = all_files('core/tests/src')\r