Commit graph

171 commits

Author SHA1 Message Date
David Tardon
b5f066e64a Revert "remove redundant test for presence of dlls"
Bah, ignore that... I forgot it also copies the dlls locally and
delivers them.

This reverts commit 5faaada54c.
2012-05-28 06:19:23 +02:00
David Tardon
5faaada54c remove redundant test for presence of dlls
Change-Id: I59a14d5579b7cb7fcf2ac5634723a8f18ed6e084
2012-05-27 12:36:45 +02:00
Bjoern Michaelsen
b1c3e8ae28 make gbuild the default assumption of build.pl
this removes dmake completely out of the build for migrated modules
build.pl now assumes modules to be gbuild, unless there is a
prj/dmake file

Change-Id: I674a036b182ee13c5ec093e83cb3d38133112d3b
2012-04-29 03:50:46 +02:00
David Tardon
28eaee81ac mingw: check for jpeg dll 2012-03-19 09:22:51 +01:00
David Tardon
9339da8659 mingw: check for system iconv dll
libxslt in Fedora mingw packages depends on it.
2012-03-19 09:22:51 +01:00
David Tardon
1f09f96e95 mingw: allow use of system zlib 2012-03-18 21:23:41 +01:00
David Tardon
1118f57582 mingw: avoid hardcoded dll versions and deps
The idea is to use libo_MINGW_CHECK_DLL for libs that must be available
(typically that would be the "main" library, e.g., libxml2 or libcurl)
and libo_MINGW_TRY_DLL for possible dependencies (that may not be the
same on different systems). All further references to the dlls are
exclusively through the configured variables or defines set from these
variables (e.g., instead of hardcoding libxml2-2.dll, use
$(MINGW_LIBXML2_DLL)).

The macros are documented in m4/mingw.m4 .

Files that must be changed when adding a new dll:
* configure.in
* config_host.mk.in
* external/mingw-dlls/makefile.mk
* scp2/source/ooo/makefile.mk
* scp2/source/ooo/mingw_dlls.scp
2012-03-18 21:23:40 +01:00
Fridrich Štrba
33eefb2c5e Bundle again C++ stdlibs with generic Linux build 2012-02-22 09:25:44 +01:00
David Tardon
398721c280 use configured HOST_PLATFORM instread of hardcoded triplet 2012-02-17 15:53:55 +01:00
Fridrich Štrba
9a51a7ae71 Copy the gcc's stdlibs to solver even if not packaging them 2012-02-13 15:39:43 +01:00
Tor Lillqvist
a6ed487d97 Decrease verbiage a little bit 2012-01-27 15:52:23 +02:00
Andras Timar
a5f7843221 no need to check for vcredist files, Windows installer don't use them 2011-12-05 15:03:34 +01:00
Jan Holesovsky
1356308d1e Revert "disable de sub-project wingw-dll for now... apparently a botched commit"
This reverts commit ef0a4c5ebb.

Sorry for the trouble, should be OK now.
2011-10-01 22:10:22 +02:00
Jan Holesovsky
19f1697a3f Add forgotten file - makefile for copying the -system dlls.
This should have been part of commit 3927d9bd2a.
2011-10-01 22:04:34 +02:00
Norbert Thiebaud
ef0a4c5ebb disable de sub-project wingw-dll for now... apparently a botched commit 2011-10-01 10:47:11 -05:00
Jan Holesovsky
3927d9bd2a Add support for bundling the -system .dll's into the MinGW builds. 2011-09-30 21:11:26 +02:00
Andras Timar
05293cb04c remove checks for unused BUILD_SPECIAL environment variable 2011-09-28 13:48:10 +02:00
Tor Lillqvist
7188a117be Use --kill-at 2011-08-30 13:51:34 +03:00
Tor Lillqvist
41c2fc546a Look for and deliver shared libgcc and libstdc++ for MinGW
Also remove mingwm10.dll stuff. That is an obsolete DLL not used by
current MinGW, says Fridrich.
2011-08-30 11:13:30 +03:00
Tor Lillqvist
eefc25d1d2 Bin USE_MINGW
Its alternative values as used by OOo is irrelevant to us as we don't
intend to support building using MinGW on Windows itself. To us, MinGW
always means cross-compilation. For us it is enough to look at
$(OS)$(COM), and WNTGCC always implies cross-compilation.

(OOo on the other hand attempts to support use of the Cygwin gcc with
the -mno-cygwin option (which is practically considered an obsolete
option), the normal MinGW compiler (but still from Cygwin), but not
cros-compilation.)
2011-08-26 20:54:59 +03:00
Tor Lillqvist
ec937d5c10 MsiGetPatchInfoA and W were missing 2011-07-21 23:30:12 +03:00
Tor Lillqvist
c2a0aed22a Make import libs for msi and urlmon dlls based on Wine's .def files 2011-07-21 23:21:40 +03:00
Tor Lillqvist
7efa9cb259 Relocate the headers from Wine, add two new ones 2011-07-14 21:04:39 +03:00
Tor Lillqvist
490b499531 Add constructor and GetValue() method to the Color class 2011-07-14 18:17:37 +03:00
Tor Lillqvist
c25d059a8b Add the gdiplus headers and import library from Wine, for cross-compilation 2011-07-14 15:57:16 +03:00
Tor Lillqvist
6be700e1ca Produce an import library for jawt.dll when cross-compiling to Windows
There is just one export from jawt.dll, so just build an import
library trivially ourselves instead of requiring copying the jawt.lib
from a Windows JDK installation.
2011-06-29 12:24:25 +03:00
Tor Lillqvist
981641aec8 Simplify MinGW crack
Avoid copy-pasting. Just change the pointless use of
double-underscore-prefixed identifiers __argc and __argv in the getopt
prototypes (which clashes with stuff from MinGW's stdlib.h,
apparently) to plain argc and argv for all platforms.
2011-06-22 09:07:10 +03:00
Tor Lillqvist
790005a402 Don't do this for Android either 2011-06-09 19:10:07 +03:00
Tor Lillqvist
47ef127cb4 Always compare CROSS_COMPILING explicitly to "YES" 2011-06-06 08:57:32 +03:00
Tor Lillqvist
ad700e1f6e Drop %_EXT% which was always empty 2011-06-03 13:27:22 +03:00
Tor Lillqvist
8c3740eb6e Bypass some weird crack when cross-compiling with MinGW 2011-05-22 10:53:50 +03:00
Tor Lillqvist
b0a85a11c3 Bypass for iOS, too 2011-05-14 01:24:14 +03:00
Francois Tigeot
128ca1c1e4 Porting LO to Dragonfly 2011-02-10 10:39:26 +01:00
Thomas Arnhold
fb95d02a1d Clean up makefiles 2011-02-02 11:50:17 +01:00
Tor Lillqvist
3a79aa5f59 Drop msvc*7*.dll, see fdo#32426 2010-12-21 19:14:03 +02:00
Tor Lillqvist
682be38a3f Actually we don't seem to need instmsiw.exe 2010-12-21 19:01:26 +02:00
Tor Lillqvist
5a138f91c6 Make external/msi/readme.txt less misleading
No point talking about the ".NET compiler" as it was MSVC 2003 that
was also called "MSVC .NET". In the Microsoft compiler we now use,
2008, there is no ".NET" in the name.

Also, in LibreOffice we bundle only instmsiw.exe, not instmsia.exe.
2010-12-21 16:53:22 +02:00
Jesús Corrius
a11f35b67b Remove references to unicows.dll 2010-12-09 23:50:11 +01:00
Robert Nagy
87dddc4ac1 add OPENBSD ifdefs where needed 2010-11-06 18:31:12 +01:00
Jesús Corrius
30757d14fe Add directory for msvcp100 libraries 2010-10-28 12:24:14 +02:00
Caolán McNamara
6e56937817 tweak for AIX 2010-10-13 20:11:10 +01:00
Thomas Klausner
e2053a3b53 Do not worry about libstdc++.so.6 on NetBSD either. 2010-10-13 13:31:59 +02:00
Fridrich Štrba
f029129b7d Deliver the VC runtime distribuable installers into solver 2010-10-04 12:25:45 +02:00
Tor Lillqvist
12a436efff Drop requirements needed only for Win9x support
Don't require and distribute unicows.dll and instmsia.exe (Windows
Installer 2.0 installer for Win9x). Drop the Win9x-specific code in
setup.exe. Do still require and distribute gdiplus.dll for Win2k
support (bnc#522833).
2010-09-16 19:55:06 +03:00
Tor Lillqvist
6e84ca7a66 build-fix-win32.diff: Fix Windows build on partitions without short names 2010-09-14 12:20:45 +02:00
Kurt Zenker
e83880d897 CWS-TOOLING: integrate CWS configure25_OOO330 2010-07-13 13:58:14 +02:00
Rene Engelhard
56b4f3dee9 configure25: per request of QA: external/StAX -> stax/download 2010-06-22 22:56:36 +02:00
obo
baff42dc3f CWS-TOOLING: integrate CWS cmcfixes75 2010-06-22 15:46:16 +02:00
Mathias Bauer
4263775085 CWS systemlibc: #i69033#: some fixes for Windows 2010-06-16 19:57:33 +02:00
Caolán McNamara
94b12d448e cmcfixes75: #i111770# handle libgcc_s.so.1|2|4 in deliver 2010-06-02 12:08:17 +01:00