Attempt to make this build with MinGW

13 files changed, 50 insertions, 3 deletions

diff --git a/shell/inc/internal/thumbviewer.hxx b/shell/inc/internal/thumbviewer.hxx
index 73f6ba8de010..1e48fefcd388 100644
--- a/shell/inc/internal/thumbviewer.hxx
+++ b/shell/inc/internal/thumbviewer.hxx
@@ -40,7 +40,9 @@
 using std::min;
 using std::max;
 #endif
+#ifndef DONT_HAVE_GDIPLUS
 #include <gdiplus.h>
+#endif
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
diff --git a/shell/source/all/makefile.mk b/shell/source/all/makefile.mk
index 6c07f7079847..ffab5378fd1c 100755
--- a/shell/source/all/makefile.mk
+++ b/shell/source/all/makefile.mk
@@ -38,12 +38,16 @@ ENABLE_EXCEPTIONS=TRUE
 
 .IF "$(GUI)" == "WNT"
 CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
 CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
 CDEFS+=-D_WIN32_IE=0x501
 
 .IF "$(BUILD_X64)"!=""
 CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
 CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
 CDEFS_X64+=-D_WIN32_IE=0x501
 .ENDIF # "$(BUILD_X64)"!=""
 .ENDIF
diff --git a/shell/source/all/ooofilereader/makefile.mk b/shell/source/all/ooofilereader/makefile.mk
index a8898978596e..90f0429132fc 100755
--- a/shell/source/all/ooofilereader/makefile.mk
+++ b/shell/source/all/ooofilereader/makefile.mk
@@ -37,10 +37,14 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 
 CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
 CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
 CDEFS+=-D_WIN32_IE=0x501
 CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
 CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
 CDEFS_X64+=-D_WIN32_IE=0x501
 
 # --- Files --------------------------------------------------------
diff --git a/shell/source/win32/shlxthandler/columninfo/makefile.mk b/shell/source/win32/shlxthandler/columninfo/makefile.mk
index 29ebbbba6f7b..ceefe9387dd7 100755
--- a/shell/source/win32/shlxthandler/columninfo/makefile.mk
+++ b/shell/source/win32/shlxthandler/columninfo/makefile.mk
@@ -37,7 +37,9 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 
 CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
 CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
 CDEFS+=-D_WIN32_IE=0x501
 
 # --- Files --------------------------------------------------------
@@ -46,7 +48,9 @@ SLOFILES=$(SLO)$/columninfo.obj
 
 .IF "$(BUILD_X64)"!=""
 CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
 CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
 CDEFS_X64+=-D_WIN32_IE=0x501
 SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
 .ENDIF # "$(BUILD_X64)"!=""
diff --git a/shell/source/win32/shlxthandler/infotips/makefile.mk b/shell/source/win32/shlxthandler/infotips/makefile.mk
index 459f08cb6e3e..9daeafdbf3e8 100755
--- a/shell/source/win32/shlxthandler/infotips/makefile.mk
+++ b/shell/source/win32/shlxthandler/infotips/makefile.mk
@@ -37,7 +37,9 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 .INCLUDE :  settings.mk
 
 CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
 CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
 CDEFS+=-D_WIN32_IE=0x501
 
 # --- Files --------------------------------------------------------
@@ -46,7 +48,9 @@ SLOFILES=$(SLO)$/$(TARGET).obj
 
 .IF "$(BUILD_X64)"!=""
 CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
 CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
 CDEFS_X64+=-D_WIN32_IE=0x501
 SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
 .ENDIF # "$(BUILD_X64)"!=""
diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk
index 5e9b78a205f0..c8518f023fde 100755
--- a/shell/source/win32/shlxthandler/makefile.mk
+++ b/shell/source/win32/shlxthandler/makefile.mk
@@ -45,7 +45,13 @@ UWINAPILIB =
 UWINAPILIB_X64 =
 
 CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
 CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
+.IF "$(COM)" == "GCC"
+CDEFS+=-DDONT_HAVE_GDIPLUS
+.ENDIF
+
 CDEFS+=-D_WIN32_IE=0x501
 
 # --- Files --------------------------------------------------------
@@ -104,7 +110,9 @@ DEF1EXPORTFILE=exports.dxp
 .IF "$(BUILD_X64)"!=""
 # -------------------- x64 -----------------------
 CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
 CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
 CDEFS_X64+=-D_WIN32_IE=0x501
 
 SLOFILES_X64= \
diff --git a/shell/source/win32/shlxthandler/ooofilt/makefile.mk b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
index a2ee326ecb53..92111c6ed0ee 100755
--- a/shell/source/win32/shlxthandler/ooofilt/makefile.mk
+++ b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
@@ -41,7 +41,9 @@ UWINAPILIB=
 .INCLUDE :  settings.mk
 
 CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
 CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
 CDEFS+=-D_WIN32_IE=0x501
 
 # --- Files --------------------------------------------------------
@@ -90,7 +92,9 @@ DEF1EXPORTFILE=exports.dxp
 .IF "$(BUILD_X64)"!=""
 #---------------------------- x64 -------------------------
 CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
 CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
 CDEFS_X64+=-D_WIN32_IE=0x501
 USE_DEFFILE_X64=TRUE
 
diff --git a/shell/source/win32/shlxthandler/prophdl/makefile.mk b/shell/source/win32/shlxthandler/prophdl/makefile.mk
index 7900d149c1cd..b5195caad5e8 100755
--- a/shell/source/win32/shlxthandler/prophdl/makefile.mk
+++ b/shell/source/win32/shlxthandler/prophdl/makefile.mk
@@ -44,7 +44,9 @@ UWINAPILIB =
 UWINAPILIB_X64 =
 
 CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
 CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -wd4100
+.ENDIF
 CDEFS+=-D_WIN32_IE=0x501
 
 # --- Files --------------------------------------------------------
@@ -96,7 +98,9 @@ DEF1EXPORTFILE=exports.dxp
 # -------------------- x64 -----------------------
 .IF "$(BUILD_X64)"!=""
 CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
 CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
 CDEFS_X64+=-D_WIN32_IE=0x501
 SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
 
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index 2a6bff0ef78f..c9b57d28f2aa 100644
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -32,7 +32,7 @@
 #include <osl/diagnose.h>
 
 #include "internal/global.hxx"
-#include "internal/PropertyHdl.hxx"
+#include "internal/propertyhdl.hxx"
 #include "internal/fileextensions.hxx"
 #include "internal/metainforeader.hxx"
 #include "internal/utilities.hxx"
diff --git a/shell/source/win32/shlxthandler/res/makefile.mk b/shell/source/win32/shlxthandler/res/makefile.mk
index ec0529015179..fc2bcbd7f6e0 100755
--- a/shell/source/win32/shlxthandler/res/makefile.mk
+++ b/shell/source/win32/shlxthandler/res/makefile.mk
@@ -63,10 +63,12 @@ $(RES)$/x64$/$(TARGET).res : $(RES)$/$(TARGET).res
 .INCLUDE :	tg_wntx64.mk
 
 
-
 # Generate the native Windows resource file
 # using lngconvex.exe 
 
 $(RCFILES) : $(ULFDIR)$/shlxthdl.ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt
+.IF "$(COM)" == "MSC"
     $(subst,$(SOLARBINDIR)$/lngconvex,$(BIN)$/lngconvex $(LNGCONVEX)) -ulf $(ULFDIR)$/shlxthdl.ulf -rc $(RES)$/shlxthdl.rc -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
-    
+.ELSE
+    $(LNGCONVEX) -ulf $(ULFDIR)$/shlxthdl.ulf -rc $(RES)$/shlxthdl.rc -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
+.ENDIF
diff --git a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk b/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
index fddea0d51ae8..ed90b9c198ce 100755
--- a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
+++ b/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
@@ -37,6 +37,9 @@ ENABLE_EXCEPTIONS=TRUE
 
 CFLAGS+=-DWIN32_LEAN_AND_MEAN -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
 CDEFS+=-D_WIN32_IE=0x501
+.IF "$(COM)" == "GCC"
+CDEFS+=-DDONT_HAVE_GDIPLUS
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
index cd573e38f7cf..19567cff80e0 100644
--- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
+++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
@@ -26,6 +26,8 @@
  *
  ************************************************************************/
 
+#ifndef DONT_HAVE_GDIPLUS
+
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_shell.hxx"
 
@@ -529,4 +531,6 @@ Gdiplus::Rect CThumbviewer::CalcScaledAspectRatio(Gdiplus::Rect src, Gdiplus::Re
     return result;
 }
 
+#endif // DONT_HAVE_GDIPLUS
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/util/makefile.mk b/shell/source/win32/shlxthandler/util/makefile.mk
index 1d47624a80d9..dff0fa9faf7f 100755
--- a/shell/source/win32/shlxthandler/util/makefile.mk
+++ b/shell/source/win32/shlxthandler/util/makefile.mk
@@ -36,11 +36,15 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 
 CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
 CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
 CDEFS+=-D_WIN32_IE=0x501
 
 CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+.IF "$(COM)" == "MSC"
 CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+.ENDIF
 CDEFS_X64+=-D_WIN32_IE=0x501
 
 # --- Files --------------------------------------------------------