[Libreoffice-commits] .: 3 commits - Library_merged.mk sd/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Aug 20 03:14:03 PDT 2012
Library_merged.mk | 15 ++++++++++++++-
sd/source/ui/remotecontrol/BluetoothServer.cxx | 5 +++--
2 files changed, 17 insertions(+), 3 deletions(-)
New commits:
commit e607f5f651b14fa779a9800865afba2758286a4b
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Aug 20 13:02:08 2012 +0300
More deps for Android
Change-Id: Ifc99e894885ed835c3205c3eea708a07273b52b3
diff --git a/Library_merged.mk b/Library_merged.mk
index 123e64a..1ac02e5 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)
commit d9b506e9e3ae3834c85a0eaf92128bc12095e62f
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Aug 20 12:45:59 2012 +0300
Put a few (GNU/)Linuxisms inside ifdefs
Change-Id: I391edae66298810583c3ac4029cadd182af39ff2
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 3cd8cbc..0ff8e43 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -9,9 +9,11 @@
#include "BluetoothServer.hxx"
#include <stdio.h>
+#ifdef LINUX
#include <gio/gio.h>
-#include <stdint.h>
#include <sys/unistd.h>
+#endif
+#include <stdint.h>
#include <sys/socket.h>
#include <tools/debug.hxx>
#include <tools/stream.hxx>
@@ -172,4 +174,4 @@ void BluetoothServer::setup()
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 0198ba86855809d07547de5e96ba4aa48233d81c
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Aug 20 12:36:40 2012 +0300
Use graphite only if ENABLE_GRAPHITE
Change-Id: I4e3274c43e34f6b28277ac75f96ae8c146e94c40
diff --git a/Library_merged.mk b/Library_merged.mk
index da48a93..123e64a 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_Library_use_libraries,merged,\
))
$(eval $(call gb_Library_use_externals,merged,\
- graphite \
icule \
icuuc \
jpeg \
@@ -57,6 +56,12 @@ $(eval $(call gb_Library_use_externals,merged,\
zlib \
))
+ifeq ($(ENABLE_GRAPHITE),TRUE)
+$(eval $(call gb_Library_use_externals,merged,\
+ graphite \
+))
+endif
+
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Library_use_externals,merged,\
berkeleydb \
More information about the Libreoffice-commits
mailing list