ignore .pyc files under git; use /usr/local (e.g., homebrew) as an imagemagick source

git-svn-id: https://zxing.googlecode.com/svn/trunk@2483 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
smparkes@smparkes.net 2012-10-29 18:23:34 +00:00
parent 7b9eb7af63
commit d7b0f2cb82
2 changed files with 8 additions and 3 deletions

3
cpp/.gitignore vendored
View file

@ -2,4 +2,5 @@
/.sconsign.dblite
xcuserdata
callgrind.out.*
contents.xcworkspacedata
contents.xcworkspacedata
*.pyc

View file

@ -26,7 +26,7 @@ flags.append("-Wextra -Werror")
# flags.append("-pedantic")
compile_options['CXXFLAGS'] = ' '.join(flags)
compile_options['LINKFLAGS'] = "-ldl -L/usr/lib -L/opt/local/lib"
compile_options['LINKFLAGS'] = "-ldl -L/usr/lib -L/opt/local/lib -L/usr/local/lib"
def all_files(dir, ext='.cpp', level=6):
files = []
@ -36,7 +36,11 @@ def all_files(dir, ext='.cpp', level=6):
magick_include = ['/usr/include/ImageMagick/', '/opt/local/include/ImageMagick/']
magick_include = [
'/usr/include/ImageMagick/',
'/opt/local/include/ImageMagick/',
'/usr/local/include/ImageMagick/'
]
magick_libs = ['Magick++', 'MagickWand', 'MagickCore']
# check for existence of libiconv and add it to magick_libs if possible