Commit graph

1070 commits

Author SHA1 Message Date
Tor Lillqvist
4eaf127447 Don't add a bogus C:/cygwin64/lib/x86 (or similar) directory to ILIB
If we don't know of any separate DirectX SDK library, don't use the
$DIRECTXSDK_LIB variable which is bogus at that point.

Thanks to Nicholas Ferguson for noticing.

Change-Id: I333478da7757694ca9236fd485e93bbd88305278
2014-08-22 18:57:08 +03:00
Bjoern Michaelsen
7524f45e0a remove superfluous --with-theme=default option
- currently mapped to --with-theme=galaxy for migration
- warns though

Change-Id: Ib40dabd4c54b6cac0b7f3c6f6183b2e4d1545331
2014-08-22 14:09:15 +02:00
Caolán McNamara
2ced4d39cc linux_powerpc64le->linux_powerpc64_le to match dp_platform.cxx
Change-Id: Ib63e5a28d7ff12780a1051d94c5976244eab1814
2014-08-21 14:16:40 +01:00
Caolán McNamara
632e4095ad openjdk appears to use ppc64/server/libjvm.so and not ppc64le/server/libjvm.so
Change-Id: Iff9e2e0ac9921b0d9d36a49fdcd2323d5dd124ee
2014-08-21 10:17:49 +01:00
Caolán McNamara
170109708e Related: rhbz#1125588 first steps for ppc64le
almost certainly won't get us too far, but a start

Change-Id: Ic20b97a97b6d506c32322173bd8332d15c3a4555
2014-08-21 08:54:16 +01:00
rbuj
d8a7f72bab Use COMMONS_LOGGING_VERSION vble
Change-Id: I0c76ec7e3f9b95166b4005dd1ad5349b3889c3e4
Reviewed-on: https://gerrit.libreoffice.org/10993
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-08-20 07:29:55 -05:00
Tor Lillqvist
b6ef6831b4 Handle SYSTEM_LIBXML_FOR_BUILD, should fix cross-compilation
Change-Id: Ideba1e359c1e199dcf40fa22f6d520ba9e20dd11
2014-08-17 13:31:33 +03:00
Thomas Arnhold
439354a0b4 upgrade to apache-commons-1.2
Change-Id: Ic356c6a23f42b5fe37be1075e8508bb168eac9a1
Reviewed-on: https://gerrit.libreoffice.org/10927
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-08-16 21:56:35 -05:00
Miklos Vajna
c9cf219dc5 Fix $(call gb_ExternalExecutable_get_command,xmllint) in case of system libxml
Change-Id: If9b32b09fd8cbf8b194b75357494d99aaa3fe06e
2014-08-16 17:41:59 +02:00
Michael Stahl
36ce22f41a fdo#82430: MSVC 2010 refuses both -clr and -arch in the same command
Change-Id: I41339e05ec914a2d660d87c99c99b824dddd10c9
2014-08-15 12:33:43 +02:00
Michael Stahl
8bd6bf93b7 fdo#82430: configure: MSVC build: avoid using SSE2 instructions
MSVC 2012 for x86 defaults to -arch:SSE2; binaries do not run on any AMD
32-bit CPU, neither on Intel Pentium III.

http://msdn.microsoft.com/en-us/library/vstudio/7t5yh4fd%28v=vs.110%29.aspx

Change-Id: Ie8253137db2699f2a7fa69c4ac4e7ded90931e3e
2014-08-14 18:55:17 +02:00
Tor Lillqvist
a4f4edb344 Rename misleadingly named variable
Change-Id: I48c7e2d29c16b61b71ef72a0a45792c968c0fa0f
2014-08-14 14:28:07 +03:00
Tor Lillqvist
fd56de496e Look also for iOS SDK 8.0
Change-Id: I0587e395f6b4833953618b1a0ac1e201a1f79b61
2014-08-14 14:26:29 +03:00
Markus Mohrhard
0ea59fd0bb clean configure.ac enable-opengl for windows
It works now and should get the same treatment as the linux version.

Change-Id: I382cc7cae9358ce26e0c2d85acc6a67e991d8118
2014-08-13 11:38:23 +02:00
Markus Mohrhard
5bad93f5d5 enable opengl by default on windows
Change-Id: I04cd67cce88563c0e1d82af984ccd3e6516b69cb
2014-08-13 11:38:22 +02:00
Lionel Elie Mamane
382ad73866 in replacement is *also* a GNU sed extension - not available on MacOS X
Change-Id: Ic4efe84ba6e6d0e36b520957bc56d24e14161966
2014-08-12 13:33:05 +02:00
Lionel Elie Mamane
41e4a607b0 \+ is a GNU sed extension - not available on MacOS X
also support a MySQL/MariaDB client lib link line without any "-L"

Change-Id: I1c2bc13f35a33c0f62f0d23d0982d5977aafe2c3
2014-08-12 04:25:40 +02:00
Lionel Elie Mamane
35836d2494 switch internal mariadb client to version 2
and reenable it: hopefully the worst bugs are fixed now

Change-Id: I8033ef87d02ba6619e5f778b5255fa803ba63c5b
2014-08-11 13:51:38 +02:00
Tor Lillqvist
ad85ce18d3 "fixes" needed because ure/source/unorc is now expanded at configure time
Argh, this is getting even uglier.

We cheerfully ignore for now the theoretical possibility that the URE
unorc used by build-time tools (i.e. the configure-expanded
ure/source/unorc) could be different for HOST and BUILD (in case they
use different --enable-canonical-installation-tree-structure), and use
the HOST one for the BUILD tools.

The right thing would probably be to construct the URE unorc in the
relevant Makefile, like we do for fundamentalrc? Or then to just
re-design the whole mess of rc files into some simpler (good luck).

Change-Id: I654309503d0e696778910acadcbf2f6b90ffa02a
2014-08-11 08:15:03 +03:00
Tor Lillqvist
4625227ed8 Seems to work now
Change-Id: I59402e2f0503369370cc87017e0c8e01541ccfa0
2014-08-10 10:08:40 +03:00
Tor Lillqvist
d83f28a250 Use @LIBO_URE_SHARE_JAVA_FOLDER@ instead of hardcoding ../share/java
Makes CppunitTest_dbaccess_hsqldb_test work also in the
--enable-canonical-installation-tree-structure (on OS X), otherwise
the use of $URE_INTERNAL_JAVA_CLASSPATH (looked up from the URE unorc)
in stoc/source/javavm/javavm.cxx fails.

Change-Id: I5ea045594c32e6a1398b73cff1e4aa8bbe1aa265
2014-08-10 10:08:31 +03:00
David Ostrovsky
05ed013cbc VS2013: Prefer it over VS2012 and VS2010
The preference for compiler picking on Windows is:

1. vs2012
2. vs2010
3. vs2013

Because vs2013 was considered as unsupported compiler the only
option to acivate is to provide additional option to the autogen:

  --with-visual-studio=2013

Now, that vs2013 is up and running change the preference order and
pick the newest installed compiler.

Change-Id: I76412b9a1bd9514904bbcca99230896add0424f1
Reviewed-on: https://gerrit.libreoffice.org/10154
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-08-09 09:34:57 +00:00
Stephan Bergmann
5ab1098d5f Generalize -fsanitize=address checks
...that are at least also relevant for -fsanitize=undefined

Change-Id: I39044d2a73912a605af8e965eb1cdf8dfd4f0051
2014-08-08 16:07:24 +02:00
Michael Stahl
4c0eb74307 configure: SunStudio is not a (supported) C++ compiler
Change-Id: I65d5f499b2948f9e57c47d262a2d6e5e8cbcf8da
2014-08-08 14:14:31 +02:00
Markus Mohrhard
779ae371b1 reuse OpenGLContext in OGL canvas
The only thing that needs to be reimplemented is the pbuffer based
custom sprite rendering. We should use a FBO with a texture backend
for that. This will also save several OpenGL context switches!

Change-Id: I4aef33ae2499e44c8b5f41c296d8721cb94a37a1
2014-08-08 09:24:00 +02:00
Zolnai Tamás
191f0944fd Handle collada libraries seperately: --disable-collada
Depends on gltf support.

Change-Id: Ief0452da3d03b0ddbca45272e5f5cd268691aeca
2014-08-07 15:42:57 +02:00
Stephan Bergmann
7479729487 Work around dirty Qt4 test code
...failing under -fsanitize=undefined -fno-sanitize-recover

Change-Id: I33a72bc1474708847f4cfc6d3d2ae6a19eb80c7f
2014-08-07 15:26:53 +02:00
Michael Stahl
ff929ad45c remove unnecessary references to test-install (just use instdir)
Change-Id: I99f19a3e2ed166c2ea4397f8767975973dd5d983
2014-08-07 11:49:15 +02:00
Tor Lillqvist
0acc3300f1 If dev-install is obsolete, why have it at all?
Replace mentions of it in a few (dcumentation) places with test-install.

Change-Id: I6fc8e58fa5813b05de16feec35215c83e0e45834
2014-08-07 09:04:45 +03:00
Rene Engelhard
d85f513934 implement --with-system-coinmp
Change-Id: I02928097f049e8f3cbefbc872b570b2d2b072658
2014-08-06 00:03:21 +02:00
Rene Engelhard
97bda8e081 implement --with-system-gltf
Change-Id: Ic842006b28f8043bcbbaa81ab5a20e15aa52ac82
2014-08-05 20:06:17 +02:00
Tor Lillqvist
83f3770567 Presumably no point in automatically disabling avmedia for iOS either then
(Re: 7f36e996a0)

Change-Id: I115bb35cd4c469661b5a8e3af378618b718f2a29
2014-08-04 12:13:40 +03:00
Tomaž Vajngerl
7f36e996a0 build avmedia for Android
Change-Id: I0137bb7ce6337ca852af513565cc19dad3c8dc8b
2014-08-03 22:42:19 +02:00
Tor Lillqvist
7e02666cbb Accept NDK r10
Also, don't bother accepting NDK r8* any longer.

Change-Id: I87fa37a8bb4b00033fe9f81e8b9fc8b09af3b784
2014-08-01 10:17:32 +03:00
Tor Lillqvist
0f89f655c0 It's called "GNU Make", not "gnumake"
Change-Id: I54900e077d5325fb6bfad84a2afa37f3adf551bb
2014-07-28 09:46:16 +03:00
Tor Lillqvist
e23fa8db9f Improvements for Windows build with only VS2013 installed
I thought it was possible now to build on Windows with Visual Studio
2013 as the only installed Visual Studio version, but no. I tried on a
fresh Windows 8.1 installation.

This commit fixes the configury a bit at least. (One needs to pass the
--with-visual-studio=2013 option. Otherwise configure gets confused by
the partial (?) VS2012 that seems to be installed, too, when
installing VS2013, and prefers that...)

The build fails at least in external/lcms2, but I'll leave sorting out
that for later.

Change-Id: I15942e4b088a3f0a62c3f7fa8f9b45f77beaff6f
2014-07-28 09:20:09 +03:00
Markus Mohrhard
887c088f20 make libgltf compile on OSX
Change-Id: Ie39292137f931bfd557f66c485e104cf5d5089b8
2014-07-23 21:51:42 +02:00
Michael Stahl
66c09dd250 configure: unused variable
Change-Id: I0172814081d443c21fc46bb9c5e26a5f459db9fa
2014-07-23 14:06:40 +02:00
Michael Stahl
663c181c56 configure: stop calling native Win32 make "horribly slow"
OTOH we do have sufficient data to start name-calling Cygwin make:
http://lists.freedesktop.org/archives/libreoffice/2014-June/061727.html

Change-Id: I290c39805d237c7da9a7aa954ec45a58c92fa2d2
2014-07-23 13:59:57 +02:00
Norbert Thiebaud
269e960ee1 add config_vcl to control DevicePixel coordinate base type
The eventual goal is to make vcl capable of handling a backend
that use double instead of sal_Int32 as its base type
for device coordinate.

Change-Id: I6174f1f4afe00992b95c9163bc21dd54fec98631
2014-07-20 22:10:58 +02:00
Luboš Luňák
f6d7e7bb45 fix Qt4 filedialog configure checks again
Change-Id: Ic18e4a7ad725640ffdeb15a1982ecb9131d11697
2014-07-20 13:29:28 +02:00
David Tardon
7515b1a90f fdo#63756 build libxml2 with ICU support
Change-Id: I0523e49e640812be435ba4c97b1881ca253eb2ab
2014-07-20 10:15:25 +02:00
rbuj
986beb05e8 OS X: SDK configuration
Adds several improvements for setting the SDK.

Change-Id: Id6aa7c972ec5f11f1a43ced90f0411e55328eef3
Reviewed-on: https://gerrit.libreoffice.org/9952
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-14 11:33:58 +00:00
Douglas Mencken
9e328623c4 allow modern GCC to be automatically chosen on OS X 10.5
Don't force gcc-4.2 for OS X SDK 10.5 when $CC version is newer than 4.2

Change-Id: I7031517f8c2140a9dcb56abe6f6db5c9ed8f21f9
Reviewed-on: https://gerrit.libreoffice.org/10118
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-11 15:32:36 +00:00
Michael Meeks
7413c75b71 Cleanup configure's make recommendations for stale make versions.
Change-Id: Ib0c546e835bd3e6961632d4644901436061dc072
2014-07-10 13:30:26 +01:00
Michael Meeks
af433f404f fdo#75937 - package galaxy theme in a form we like; cf. fdo#81103.
Change-Id: If920257f141a2dc4208d1fd322b875fdc8315cee
2014-07-09 13:51:31 +01:00
Norbert Thiebaud
27c6cf1d75 cosmetic: fix few intentations irregularities
Change-Id: I3154e79cf43b836c46512575834ed8a99b56c912
2014-07-08 23:22:19 +02:00
Norbert Thiebaud
38e6216cfd kill UPD,SOURCEVERION and WORK_STAMP
Change-Id: Icea7057734020914fe0df3df70c8a895e96c1af0
2014-07-08 23:22:19 +02:00
Douglas Mencken
08abec41d6 Bump build-time system python's requirement to 2.6.
"Writing Python code that is OK on 2.x and 3.x is next to impossible
when 2.x is 2.5" --Miklos Vajna

Change-Id: I432c2773eb60ab3bd5cc907407ca5159ce4390ad
Reviewed-on: https://gerrit.libreoffice.org/10116
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-08 18:45:58 +00:00
Tor Lillqvist
a1711c717e Construct and propagate the argument to xcodebuild's -sdk option
Change-Id: I810ea99f61c47da62f2489d5176f6fbb779134a9
2014-07-08 18:20:48 +03:00