summaryrefslogtreecommitdiff
path: root/Library_merged.mk
diff options
context:
space:
mode:
authorAndrzej J.R. Hunt <andrzej@ahunt.org>2013-06-14 14:55:22 +0100
committerAndrzej J.R. Hunt <andrzej@ahunt.org>2013-07-16 16:40:09 +0200
commit0f16fa0fa58180a79aa5d27b44dbab4f9b6374b4 (patch)
treea0be4bc4f6fa6788fd239acf8ef356794a26a81f /Library_merged.mk
parent8c325831b36394fa9217e30c706f36dc6ac7fafc (diff)
Build firebird 2.5 internally. Also adds libatomic_ops.
Change-Id: I44a45e781dfb3624cdebf4530ae44870bf39a82a
Diffstat (limited to 'Library_merged.mk')
-rw-r--r--Library_merged.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/Library_merged.mk b/Library_merged.mk
index 932d18b428b3..439f437c6904 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -47,6 +47,8 @@ $(eval $(call gb_Library_use_externals,merged,\
icuuc \
jpeg \
lcms2 \
+ libatomic_ops \
+ libfbembed \
liblangtag \
libxml2 \
libxslt \