projects
/
zxing.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Issue 521, avoid an NPE
[zxing.git]
/
cpp
/
SConscript
diff --git
a/cpp/SConscript
b/cpp/SConscript
index
8283952
..
fd03b3d
100644
(file)
--- a/
cpp/SConscript
+++ b/
cpp/SConscript
@@
-1,13
+1,21
@@
Decider('MD5')
\r
\r
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
\r
-debug =
True
\r
+debug =
env['DEBUG']
\r
compile_options = {}
\r
flags = []
\r
if debug:
\r
#compile_options['CPPDEFINES'] = "-DDEBUG"
\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
compile_options['CXXFLAGS'] = ' '.join(flags)
\r
\r
\r