[Libreoffice-commits] .: 2 commits - distro-configs/LibreOfficeAndroid.conf README.cross

[Tor Lillqvist]

 README.cross                           |    2 +-
 distro-configs/LibreOfficeAndroid.conf |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 0901e28e8184372d15c1719a2343b4709dadedbe
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Jun 9 20:42:08 2011 +0300

    Add C++ include paths

diff --git a/README.cross b/README.cross
index ecbdc6a..80bd20c 100644
--- a/README.cross
+++ b/README.cross
@@ -194,7 +194,7 @@ Windows will probably drive you insane.)
 
 Here is my autogen.lastrun for Android:
 CC=ccache /home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot /home/tml/android-ndk-r5b/platforms/android-9/arch-arm
-CXX=ccache /home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ --sysroot /home/tml/android-ndk-r5b/platforms/android-9/arch-arm
+CXX=ccache /home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ --sysroot /home/tml/android-ndk-r5b/platforms/android-9/arch-arm -I /home/tml/android-ndk-r5b/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r5b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include  -fexceptions -frtti
 AR=/home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar
 NM=/home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm
 OBJDUMP=/home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump
commit b05b814673fea99e42dd74f91d80b7899315ce6c
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Jun 9 20:41:45 2011 +0300

    No --disable-cairo needed any more

diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index 0d83a22..927cf25 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -1,5 +1,4 @@
 --host=arm-linux-androideabi
---disable-cairo
 --disable-cups
 --disable-fontconfig
 --disable-gconf