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 /solenv | |
| 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 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/winmingw.mk | 4 | ||||
| -rw-r--r-- | solenv/inc/wntgcci.mk | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk index a19717454f3e..518ff944b970 100644 --- a/solenv/gbuild/platform/winmingw.mk +++ b/solenv/gbuild/platform/winmingw.mk @@ -85,10 +85,6 @@ gb_COMPILERDEFS := \ -D_MSC_EXTENSIONS \ -D_FORCENAMELESSUNION \ -ifeq ($(USE_MINGW),cygwin-w64-mingw32) -gb_COMPILERDEFS +=-D_declspec=__declspec -endif - gb_CPUDEFS := \ -DINTEL \ -D_M_IX86 \ diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk index 34faf329fda0..38fa79c8125b 100644 --- a/solenv/inc/wntgcci.mk +++ b/solenv/inc/wntgcci.mk @@ -106,11 +106,7 @@ LINKC*=$(CC) CYGLIB=$(LIB:s/;/ -L/) LINKFLAGS= -Wl,--enable-stdcall-fixup,--enable-runtime-pseudo-reloc-v2 -L$(CYGLIB) -.IF "$(USE_MINGW)"=="cygwin" -MINGWLIBDIR=$(COMPATH)$/lib$/mingw -.ELSE MINGWLIBDIR=$(COMPATH)$/lib -.ENDIF MINGWSSTDOBJ= MINGWSSTDENDOBJ= LINKFLAGSAPPGUI=-mwindows |