diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-08-20 13:02:08 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-08-20 13:04:50 +0300 |
| commit | e607f5f651b14fa779a9800865afba2758286a4b (patch) | |
| tree | 4e7ce1cf5545760c14cba26eba66d71c440a2d1c /Library_merged.mk | |
| parent | d9b506e9e3ae3834c85a0eaf92128bc12095e62f (diff) | |
More deps for Android
Change-Id: Ifc99e894885ed835c3205c3eea708a07273b52b3
Diffstat (limited to 'Library_merged.mk')
| -rw-r--r-- | Library_merged.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 123e64ac80c3..1ac02e5d9c26 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -124,13 +124,21 @@ endif ifeq ($(OS),ANDROID) $(eval $(call gb_Library_use_libraries,merged,\ + basebmp \ libotouch \ )) + $(eval $(call gb_Library_add_libs,merged,\ -llog \ -landroid \ -llo-bootstrap \ )) + +$(eval $(call gb_Library_use_externals,merged,\ + fontconfig \ + freetype \ + expat_utf8 \ +)) endif ifeq ($(OS),IOS) |