Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2014-02-22 23:15:08 +01:00
commit 8a4aed67d5
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd-java/CMakeLists.txt
View file

@ -63,6 +63,7 @@ if(CMAKE_SHARED_LIBS_ALLOWED_ON_TARGET)
target_compile_definitions(OsmAndJNI target_compile_definitions(OsmAndJNI
PRIVATE PRIVATE
-DOSMAND_JNI_EXPORTS -DOSMAND_JNI_EXPORTS
-DOSMAND_SWIG
) )
target_include_directories(OsmAndJNI target_include_directories(OsmAndJNI
PRIVATE PRIVATE

2
OsmAnd/full-ndk-build.sh
View file

@ -29,7 +29,7 @@ if [[ "$(uname -a)" =~ Darwin ]]; then
fi fi
fi fi
OSMAND_ANDROID_EXTERNAL_DEPENDENCIES=(expat freetype gdal giflib glm glsl-optimizer jpeg libpng protobuf qtbase-android skia boost-android) OSMAND_ANDROID_EXTERNAL_DEPENDENCIES=(expat freetype gdal giflib glm glsl-optimizer jpeg libpng protobuf qtbase-android skia icu4c boost-android)
"$SCRIPT_LOC/../../core/externals/configure.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]} "$SCRIPT_LOC/../../core/externals/configure.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]}
"$SCRIPT_LOC/../../core/externals/build.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]} "$SCRIPT_LOC/../../core/externals/build.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]}
"$SCRIPT_LOC/../OsmAnd-java/generate-swig.sh" "$SCRIPT_LOC/../OsmAnd-java/generate-swig.sh"