azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

samples: Use headerFilterAdditionalSearchPrefixes interop option

Browse Source
This commit is contained in:
Ilya Matveev
2017-11-15 19:07:09 +07:00
committed by ilmat192
parent 9a545efa1b
commit 5c05891ba7
6 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/gitchurn/build.gradle
+5 -4
View File
@@ -4,11 +4,12 @@ konan.targets = ['macbook', 'linux']
konanArtifacts { konanArtifacts {
interop('libgit2') { interop('libgit2') {
target('linux') { target('linux') {
includeDirs '/usr/include' headerFilterAdditionalSearchPrefix '/usr/include'
} }
target('macbook') { target('macbook') {
includeDirs '/opt/local/include', '/usr/local/include' headerFilterAdditionalSearchPrefixes '/opt/local/include', '/usr/local/include'
} }
} }
samples/gitchurn/build.sh
+8 -10
View File
@@ -4,8 +4,9 @@ DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )
source "$DIR/../konan.sh" source "$DIR/../konan.sh"
CFLAGS_macbook="-I/opt/local/include -I/usr/local/include" INTEROP_ARGS_macbook="-headerFilterAdditionalSearchPrefix /usr/local/include \
CFLAGS_linux=-I/usr/include -headerFilterAdditionalSearchPrefix /opt/local/include"
INTEROP_ARGS_linux="-headerFilterAdditionalSearchPrefix /usr/include"
if [ x$TARGET == x ]; then if [ x$TARGET == x ]; then
case "$OSTYPE" in case "$OSTYPE" in
@@ -15,20 +16,17 @@ case "$OSTYPE" in
esac esac
fi fi
var=CFLAGS_${TARGET} var=INTEROP_ARGS_${TARGET}
CFLAGS=${!var} INTEROP_ARGS=${!var}
var=LINKER_ARGS_${TARGET} COMPILER_ARGS= # add -opt for an optimized build.
LINKER_ARGS=${!var}
var=COMPILER_ARGS_${TARGET}
COMPILER_ARGS=${!var} # add -opt for an optimized build.
mkdir -p $DIR/build/c_interop/ mkdir -p $DIR/build/c_interop/
mkdir -p $DIR/build/bin/ mkdir -p $DIR/build/bin/
cinterop -compilerOpts "$CFLAGS" -def $DIR/src/main/c_interop/libgit2.def -target $TARGET \ cinterop $INTEROP_ARGS -def $DIR/src/main/c_interop/libgit2.def -target $TARGET \
-o $DIR/build/c_interop/libgit2 || exit 1 -o $DIR/build/c_interop/libgit2 || exit 1
konanc -target $TARGET $DIR/src/main/kotlin -library $DIR/build/c_interop/libgit2 \ konanc $COMPILER_ARGS -target $TARGET $DIR/src/main/kotlin -library $DIR/build/c_interop/libgit2 \
-o $DIR/build/bin/GitChurn || exit 1 -o $DIR/build/bin/GitChurn || exit 1
echo "Artifact path is $DIR/build/bin/GitChurn.kexe" echo "Artifact path is $DIR/build/bin/GitChurn.kexe"
samples/gitchurn/src/main/c_interop/libgit2.def
+1 -1
View File
@@ -1,4 +1,4 @@
headers = git2.h headers = git2.h
linkerOpts.osx = -L/opt/local/lib -L/usr/local/lib -lgit2 linkerOpts.osx = -L/opt/local/lib -L/usr/local/lib -lgit2
linkerOpts.linux = -L/usr/lib/x86_64-linux-gnu -lgit2 linkerOpts.linux = -L/usr/lib/x86_64-linux-gnu -lgit2
headerFilter = git2/** headerFilter = git2/** git2.h
samples/libcurl/build.gradle
+2 -2
View File
@@ -5,10 +5,10 @@ konan.targets = ['macbook', 'linux']
konanArtifacts { konanArtifacts {
interop('libcurl') { interop('libcurl') {
target('linux') { target('linux') {
includeDirs '/usr/include' headerFilterAdditionalSearchPrefixes '/usr/include'
} }
target('macbook') { target('macbook') {
includeDirs '/opt/local/include', '/usr/local/include' headerFilterAdditionalSearchPrefixes '/opt/local/include', '/usr/local/include'
} }
} }
samples/libcurl/build.sh
+8 -8
View File
@@ -4,8 +4,9 @@ DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )
source "$DIR/../konan.sh" source "$DIR/../konan.sh"
CFLAGS_macbook=-I/opt/local/include INTEROP_ARGS_macbook="-headerFilterAdditionalSearchPrefix /opt/local/include"
CFLAGS_linux="-I /usr/include -I /usr/include/x86_64-linux-gnu" INTEROP_ARGS_linux="-headerFilterAdditionalSearchPrefix /usr/include \
-headerFilterAdditionalSearchPrefix /usr/include/x86_64-linux-gnu"
if [ x$TARGET == x ]; then if [ x$TARGET == x ]; then
case "$OSTYPE" in case "$OSTYPE" in
@@ -15,18 +16,17 @@ case "$OSTYPE" in
esac esac
fi fi
var=CFLAGS_${TARGET} var=INTEROP_ARGS_${TARGET}
CFLAGS=${!var} INTEROP_ARGS=${!var}
var=COMPILER_ARGS_${TARGET} COMPILER_ARGS= # add -opt for an optimized build.
COMPILER_ARGS=${!var} # add -opt for an optimized build.
mkdir -p $DIR/build/c_interop/ mkdir -p $DIR/build/c_interop/
mkdir -p $DIR/build/bin/ mkdir -p $DIR/build/bin/
cinterop -compilerOpts "$CFLAGS" -compilerOpts -I$DIR -def $DIR/src/main/c_interop/libcurl.def -target $TARGET \ cinterop $INTEROP_ARGS -def $DIR/src/main/c_interop/libcurl.def -target $TARGET \
-o $DIR/build/c_interop/libcurl || exit 1 -o $DIR/build/c_interop/libcurl || exit 1
konanc -target $TARGET $DIR/src/main/kotlin -library $DIR/build/c_interop/libcurl \ konanc $COMPILER_ARGS -target $TARGET $DIR/src/main/kotlin -library $DIR/build/c_interop/libcurl \
-o $DIR/build/bin/Curl || exit 1 -o $DIR/build/bin/Curl || exit 1
echo "Artifact path is $DIR/build/bin/Curl.kexe" echo "Artifact path is $DIR/build/bin/Curl.kexe"
samples/videoplayer/build.gradle
+2 -2
View File
@@ -7,11 +7,11 @@ konanArtifacts {
defFile 'src/main/c_interop/ffmpeg.def' defFile 'src/main/c_interop/ffmpeg.def'
target 'linux', { target 'linux', {
includeDirs '/usr/include', '/usr/include/x86_64-linux-gnu' headerFilterAdditionalSearchPrefixes '/usr/include', '/usr/include/x86_64-linux-gnu'
} }
target 'macbook', { target 'macbook', {
includeDirs '/opt/local/include', '/usr/local/include' headerFilterAdditionalSearchPrefixes '/opt/local/include', '/usr/local/include'
} }
target 'mingw', { target 'mingw', {