X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=cpp%2FSConscript;h=fd03b3d2fb71eaa613fd0f703c86191467199527;hb=37276b87ab934f052aee304396303c276d1c5de5;hp=d3245452e7fe9fbf04282eb348965e443bd89583;hpb=51887ac4e0fe734c3cf9e8f0083fbb4d0f9e84a1;p=zxing.git

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