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.)

berkeleydb/makefile.mk

@@ -139,9 +139,6 @@ db_CC+=-shared-libgcc
 db_CXX+=-shared-libgcc
 .ENDIF
 db_LDFLAGS=-no-undefined -L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin
-.IF "$(USE_MINGW)"=="cygwin"
-db_LDFLAGS+=-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api
-.ENDIF
 db_LDFLAGS+=-L$(COMPATH)/lib -L$(MINGW_CLIB_DIR)
 db_LIBS=
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"

canvas/Library_directx5canvas.mk

@@ -62,20 +62,11 @@ $(eval $(call gb_Library_add_linked_libs,directx5canvas,\
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_add_linked_libs,directx5canvas,\
-	user32 \
+	d3dx \
 	gdi32 \
 	gdiplus \
 	ddraw \
 ))
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,directx5canvas,\
-what is $(DIRECTXSDK_LIB)/d3dx.lib now? \
-))
-else
-$(eval $(call gb_Library_add_linked_libs,directx5canvas,\
-	d3dx \
-))
-endif
 endif
 
 $(WORKDIR)/CustomTarget/canvas/source/directx/%.cxx : $(SRCDIR)/canvas/source/directx/%.cxx

canvas/Library_directx9canvas.mk

@@ -67,15 +67,6 @@ $(eval $(call gb_Library_add_linked_libs,directx9canvas,\
 	gdi32 \
 	gdiplus \
 ))
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,directx9canvas,\
-what is $(DIRECTXSDK_LIB)/d3d9.lib now? \
-))
-else
-$(eval $(call gb_Library_add_linked_libs,directx9canvas,\
-	d3d9 \
-))
-endif
 endif
 
 $(eval $(call gb_Library_add_exception_objects,directx9canvas,\

configure.in

@@ -2775,11 +2775,6 @@ if test "$_os" = "WINNT"; then
         MACHINE_PREFIX=`$CC -dumpmachine`
         if echo $MACHINE_PREFIX | grep -q mingw32; then
             AC_MSG_RESULT([yes])
-            if $CC -dumpspecs | grep -q "mno-cygwin"; then
-                USE_MINGW="cygwin"
-            else
-                USE_MINGW="pure-mingw"
-            fi
         else
             AC_MSG_ERROR([Compiler is not MinGW.])
         fi
@@ -2787,7 +2782,6 @@ if test "$_os" = "WINNT"; then
 fi
 AC_SUBST(COMEX)
 AC_SUBST(MSPDB_PATH)
-AC_SUBST(USE_MINGW)
 AC_SUBST(SHOWINCLUDES_PREFIX)
 
 dnl ===================================================================

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/
 

icu/makefile.mk

@@ -179,9 +179,6 @@ CONFIGURE_DIR=source
 .IF "$(MINGW_SHARED_GCCLIB)"=="YES"
 icu_LDFLAGS+=-shared-libgcc
 .ENDIF
-.IF "$(USE_MINGW)"=="cygwin"
-icu_LDFLAGS+=-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api
-.ENDIF
 icu_LDFLAGS+=-L$(COMPATH)$/lib
 icu_LIBS=
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"

openssl/makefile.mk

@@ -128,7 +128,6 @@ UNAME=$(shell uname)
 
 .IF "$(COM)"=="GCC"
 PATCH_FILES=opensslmingw.patch
-.IF "$(USE_MINGW)" == "cygwin"
 CONFIGURE_ACTION=$(PERL) configure
 CONFIGURE_FLAGS=mingw shared 
 INSTALL_ACTION=mv libcrypto.a libcrypto_static.a && mv libcrypto.dll.a libcrypto.a && mv libssl.a libssl_static.a && mv libssl.dll.a libssl.a
@@ -138,16 +137,6 @@ OUT2LIB += libcrypto.*
 OUT2LIB += libssl.*
 OUT2BIN = ssleay32.dll
 OUT2BIN += libeay32.dll
-.ELSE
-CONFIGURE_ACTION=
-BUILD_ACTION=cmd /c "ms\mingw32"
-OUT2LIB = out/libcrypto_static.*
-OUT2LIB += out/libssl_static.*
-OUT2LIB += out/libcrypto.*
-OUT2LIB += out/libssl.*
-OUT2BIN = out/ssleay32.dll
-OUT2BIN += out/libeay32.dll
-.ENDIF
 .ELSE
 
         PATCH_FILES=openssl.patch

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 \

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