diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-04-09 18:20:57 -0400 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-04-09 18:20:57 -0400 |
| commit | c39538277497f37e0c6919bb47c9a346d226b757 (patch) | |
| tree | 0f405a58c6d267ce42a9a40d8f1c8682ca089f73 | |
| parent | bb5152d851f244365d2176714ae58ff8637bde98 (diff) | |
| download | qtlocation-mapboxgl-c39538277497f37e0c6919bb47c9a346d226b757.tar.gz | |
make sure we find boost
| -rw-r--r-- | common.gypi | 9 | ||||
| -rw-r--r-- | llmr.gyp | 12 |
2 files changed, 11 insertions, 10 deletions
diff --git a/common.gypi b/common.gypi index 0498237585..8737606c1f 100644 --- a/common.gypi +++ b/common.gypi @@ -9,18 +9,15 @@ 'cflags_cc': ['-std=c++11'], 'configurations': { 'Debug': { - 'cflags': [ '-g', '-O0', '-I<(boost_root)/include' ], + 'cflags': [ '-g', '-O0' ], 'defines': [ 'DEBUG' ], 'xcode_settings': { - 'OTHER_CPLUSPLUSFLAGS': [ '-g', '-I<(boost_root)/include' ] + 'OTHER_CPLUSPLUSFLAGS': [ '-g' ] } }, 'Release': { - 'cflags': [ '-O3', '-I<(boost_root)/include' ], + 'cflags': [ '-O3' ], 'defines': [ 'NDEBUG' ], - 'xcode_settings': { - 'OTHER_CPLUSPLUSFLAGS': [ '-I<(boost_root)/include' ] - } } } } @@ -64,7 +64,8 @@ 'MACOSX_DEPLOYMENT_TARGET':'10.9', 'PUBLIC_HEADERS_FOLDER_PATH': 'include', 'OTHER_CPLUSPLUSFLAGS':[ - '<@(png_cflags)' + '<@(png_cflags)', + '-I<(boost_root)/include', ] }, 'include_dirs':[ @@ -72,17 +73,18 @@ ], 'cflags': [ '<@(png_cflags)' + '-I<(boost_root)/include', ], 'direct_dependent_settings': { 'include_dirs':[ './include' ], 'cflags': [ - '<@(png_cflags)' + '<@(png_cflags)', ], 'xcode_settings': { 'OTHER_CPLUSPLUSFLAGS':[ - '<@(png_cflags)' + '<@(png_cflags)', ] }, 'conditions': [ @@ -129,7 +131,8 @@ 'PUBLIC_HEADERS_FOLDER_PATH': 'include', 'GCC_INPUT_FILETYPE':'sourcecode.cpp.cpp', 'OTHER_CPLUSPLUSFLAGS':[ - '<@(png_cflags)' + '<@(png_cflags)', + '-I<(boost_root)/include', ] }, 'include_dirs':[ @@ -137,6 +140,7 @@ ], 'cflags': [ '<@(png_cflags)' + '-I<(boost_root)/include', ], 'direct_dependent_settings': { 'include_dirs':[ |