AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #4734 from rokuz/fixed-ios-android-build

Browse source 
Fixed building on iOS and Android
This commit is contained in:
Jenkins 2016-11-16 17:01:24 +03:00 • committed by GitHub
commit 2eb997dad5
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/jni/Android.mk
View file

@ -25,7 +25,7 @@ define add_prebuild_static_lib
include $(PREBUILT_STATIC_LIBRARY)
endef
prebuild_static_libs := map tracking drape_frontend routing search storage indexer drape platform editor partners_api geometry coding base opening_hours
prebuild_static_libs := map tracking traffic drape_frontend routing search storage indexer drape platform editor partners_api geometry coding base opening_hours
prebuild_static_libs += pugixml oauthcpp expat freetype fribidi minizip jansson tomcrypt protobuf osrm stats_client succinct
$(foreach item,$(prebuild_static_libs),$(eval $(call add_prebuild_static_lib,$(item))))

6
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -4707,6 +4707,7 @@
"-lpugixml",
"-loauthcpp",
"-leditor",
"-ltraffic",
);
};
name = Simulator;
@ -4791,6 +4792,7 @@
"-lpugixml",
"-loauthcpp",
"-leditor",
"-ltraffic",
);
};
name = Debug;
@ -4877,6 +4879,7 @@
"-lpugixml",
"-loauthcpp",
"-leditor",
"-ltraffic",
);
};
name = AdHoc;
@ -4963,6 +4966,7 @@
"-lpugixml",
"-loauthcpp",
"-leditor",
"-ltraffic",
);
};
name = "Production Full";
@ -5050,6 +5054,7 @@
"-lpugixml",
"-loauthcpp",
"-leditor",
"-ltraffic",
);
};
name = Release;
@ -5138,6 +5143,7 @@
"-lpugixml",
"-loauthcpp",
"-leditor",
"-ltraffic",
);
};
name = "Simulator Release";