diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-26 20:49:29 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-26 20:54:59 +0300 |
| commit | eefc25d1d2eccf04571b8204663d91e61cb5f7f0 (patch) | |
| tree | d6fe0ed9445a4e059e831742d91f8115fab8663b /external | |
| parent | 933d898b10f0c71fedc882ac2f2adb258d8b5994 (diff) | |
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.)
Diffstat (limited to 'external')
| -rw-r--r-- | external/mingwheaders/makefile.mk | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/external/mingwheaders/makefile.mk b/external/mingwheaders/makefile.mk index 1928a2c2ca94..0e74daa1de45 100644 --- a/external/mingwheaders/makefile.mk +++ b/external/mingwheaders/makefile.mk @@ -34,19 +34,16 @@ TARGET=mingwheaders .IF "$(OS)$(COM)" == "WNTGCC" .IF "$(CROSS_COMPILING)" != "YES" -# Don't do any of this weird and presumably obsolete crack when -# cross-compiling -# Cygwin and MinGW use different directories for the W32API headers -.IF "$(USE_MINGW)" == "cygwin" -MINGW_INCLUDE_DIR=$/usr$/include/mingw/ -MINGW_W32API_INCLUDE_DIR=$/usr$/include/w32api/ -MINGW_W32API_LIB_DIR=$/usr$/include/w32api/ -.ELSE +# Don't do any of this for now. We support WNTGCC (MinGW) only as +# cross-compiler. It is dubious whether it would be legal to copy +# stuff from the Windows SDK to a cross-compilation build host +# anyway. Some headers and/or import libraries missing in MinGW (or +# mingw-w64 actually) we have copied from Wine in ../wine. + MINGW_INCLUDE_DIR=$(COMPATH)$/include/ MINGW_W32API_INCLUDE_DIR=$(COMPATH)$/include/ MINGW_W32API_LIB_DIR=$(COMPATH)$/lib/ -.ENDIF SYS_INCLUDE_DIR=$(MINGW_INCLUDE_DIR)$/sys/ |