Minor change to make javadoc work with new Android SDK

[zxing.git] / cpp / SConscript

diff --git a/cpp/SConscript b/cpp/SConscript
index 22bb17e..8283952 100644 (file)
--- a/cpp/SConscript
+++ b/cpp/SConscript
@@ -1,42 +1,42 @@
-Decider('MD5')
-
-env = Environment()
-
-debug = True
-compile_options = {}
-flags = []
-if debug:
-       #compile_options['CPPDEFINES'] = "-DDEBUG"
-       flags.append("-O0 -g3 -Wall")
-compile_options['CXXFLAGS'] = ' '.join(flags)
-
-
-def all_files(dir, ext='.cpp', level=5):
-       files = []
-       for i in range(level):
-               files += Glob(dir + ('/*' * i) + ext) 
-       return files
-
-
-
-magick_include = ['/usr/include/ImageMagick/']
-magick_libs = ['Magick++', 'MagickWand', 'MagickCore']
-
-cppunit_libs = ['cppunit']
-
-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_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')
-test_executable = env.Program('testrunner', test_files, CPPPATH=zxing_include, LIBS=zxing_libs + cppunit_libs, **compile_options)
-
-
-Alias('lib', zxing_libs)
-Alias('tests', test_executable)
-Alias('zxing', app_executable)
-
+Decider('MD5')\r
+\r
+env = Environment()\r
+\r
+debug = True\r
+compile_options = {}\r
+flags = []\r
+if debug:\r
+       #compile_options['CPPDEFINES'] = "-DDEBUG"\r
+       flags.append("-O0 -g3 -Wall")\r
+compile_options['CXXFLAGS'] = ' '.join(flags)\r
+\r
+\r
+def all_files(dir, ext='.cpp', level=5):\r
+       files = []\r
+       for i in range(1, level):\r
+               files += Glob(dir + ('/*' * i) + ext) \r
+       return files\r
+\r
+\r
+\r
+magick_include = ['/usr/include/ImageMagick/']\r
+magick_libs = ['Magick++', 'MagickWand', 'MagickCore']\r
+\r
+cppunit_libs = ['cppunit']\r
+\r
+zxing_files = all_files('core/src')\r
+\r
+zxing_include = ['core/src']\r
+zxing_libs = env.Library('zxing', source=zxing_files, CPPPATH=zxing_include, **compile_options)\r
+\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
+test_executable = env.Program('testrunner', test_files, CPPPATH=zxing_include, LIBS=zxing_libs + cppunit_libs, **compile_options)\r
+\r
+\r
+Alias('lib', zxing_libs)\r
+Alias('tests', test_executable)\r
+Alias('zxing', app_executable)\r
+\r