diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-18 18:52:04 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-18 18:56:58 +0300 |
| commit | 89b361c0a45741668c7cec90f871c635905887c6 (patch) | |
| tree | 981c5a9cfc45367e873f8aaa028cb91b1a5becf0 /solenv/inc/wntgcci.mk | |
| parent | 0ffc0016e13187b556aff2039acaf1b3cc08a68e (diff) | |
More cross-compiling work and cleanup
Re-introduce the old --with-mingw option but now called
--with-mingw-cross-compiler. Its purpose is now specifically to give
the cross-compiler used when building the ODK, if Java is enabled, and
if building the unowinreg.dll. It has now nothing to do with
cross-compiling LibreOffice itself.
Correspondingly, the WITH_MINGW variable now has meaning only when
building LibreOffice for Windows: If using MinGW, whether natively on
Windows itself (which we as such don't intend to support, I hope), or
cross-compiling, it is set to "yes".
Automate and simplify the search for the MinGW cross-compiler when
intending to build unowinreg.dll on Unix.
Look for the usual tool-chain tools ar, nm, objdump, pkg-config,
ranlib, strip, and for Windows alto dlltool and windres using
AC_CHECK_TOOL so that the proper cross tools are found when
needed. Propagate to environment. As such these are not used except in
the MinGW mk files so far.
Other minor cleanups.
Diffstat (limited to 'solenv/inc/wntgcci.mk')
| -rw-r--r-- | solenv/inc/wntgcci.mk | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk index b0cddddeb50e..3f8dd7eb780c 100644 --- a/solenv/inc/wntgcci.mk +++ b/solenv/inc/wntgcci.mk @@ -42,10 +42,6 @@ ARCH_FLAGS*=-march=pentium CC*=i686-w64-mingw32-gcc CXX*=i686-w64-mingw32-g++ -NM*=i686-w64-mingw32-nm -AR*=i686-w64-mingw32-ar -WINDRES*=i686-w64-mingw32-windres -v -DLLTOOL*=i686-w64-mingw32-dlltool CFLAGS+=-fmessage-length=0 -c |