start passing ldflags

This commit is contained in:
Dane Springmeyer
2014-10-29 22:16:44 -04:00
parent 761f753cbd
commit 22f67bb8ab
4 changed files with 5 additions and 76 deletions

View File

@@ -31,6 +31,7 @@
'./utils/mbgl-config/build.sh',
'<(install_prefix)',
'<(platform)',
'<@(png_ldflags)'
]
}
]

View File

@@ -1,75 +0,0 @@
{
'targets': [
{ 'target_name': 'mbgl',
'product_name': 'mbgl',
'type': 'static_library',
'standalone_static_library': 1,
'hard_dependency': 1,
'dependencies': [
'shaders',
],
'sources': [
'<!@(find src -name "*.cpp")',
'<!@(test -f "config/constants_local.cpp" && echo "config/constants_local.cpp" || echo "config/constants.cpp")',
'<!@(find src -name "*.c")',
'<!@(find src -name "*.h")',
'<!@(find include -name "*.hpp")',
'<!@(find include -name "*.h")',
'<!@(find src -name "*.glsl")',
'bin/style.json'
],
'include_dirs': [
'../include'
],
'conditions': [
['OS == "mac"', {
'xcode_settings': {
'PUBLIC_HEADERS_FOLDER_PATH': 'include',
'OTHER_CPLUSPLUSFLAGS': [
'<@(png_cflags)',
'<@(uv_cflags)',
'<@(sqlite3_cflags)',
'<@(zlib_cflags)',
'-I<(boost_root)/include',
],
'OTHER_CFLAGS': [
'<@(uv_cflags)',
],
},
}, {
'cflags': [
'<@(png_cflags)',
'<@(uv_cflags)',
'<@(sqlite3_cflags)',
'<@(zlib_cflags)',
'-I<(boost_root)/include',
],
}]
],
'direct_dependent_settings': {
'include_dirs': [
'../include',
],
'conditions': [
['OS == "mac"', {
'xcode_settings': {
'OTHER_LDFLAGS': [
'<@(png_libraries)',
'<@(uv_libraries)',
'<@(sqlite3_libraries)',
'<@(zlib_libraries)',
]
}
}, {
'libraries': [
'<@(png_libraries)',
'<@(uv_libraries)',
'<@(sqlite3_libraries)',
'<@(zlib_libraries)',
]
}]
]
}
}
]
}

View File

@@ -2,6 +2,8 @@
PREFIX=$1
PLATFORM=$2
shift
shift
VARIABLES="#!/bin/bash
@@ -9,6 +11,7 @@ VARIABLES="#!/bin/bash
CONFIG_MBGL_PREFIX=$PREFIX
CONFIG_MBGL_PLATFORM=$PLATFORM
CONFIG_MBGL_LDFLAGS=\"$@\"
"
echo "$VARIABLES" | cat - utils/mbgl-config/mbgl-config.template.sh \

View File

@@ -43,7 +43,7 @@ while test $# -gt 0; do
;;
--libs)
echo -L${CONFIG_MBGL_PREFIX}/lib -lmbgl -lmbgl-${CONFIG_MBGL_PLATFORM} -lmbgl-headless
echo -L${CONFIG_MBGL_PREFIX}/lib -lmbgl -lmbgl-${CONFIG_MBGL_PLATFORM} -lmbgl-headless ${CONFIG_MBGL_LDFLAGS}
;;
--includedir)