diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-20 20:21:59 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-20 20:21:59 +0300 |
| commit | f1c4c90a5bb54acd01befe2f77c5173ab3814949 (patch) | |
| tree | b62d560677a596aa8f78ddcf0b2356c38e0e6654 /fpicker | |
| parent | 855fd72c8056a3f9e04601f0d2bd9a1cb897d79e (diff) | |
Fix MinGW compilation errors
Diffstat (limited to 'fpicker')
5 files changed, 8 insertions, 2 deletions
diff --git a/fpicker/source/win32/filepicker/workbench/makefile.mk b/fpicker/source/win32/filepicker/workbench/makefile.mk index 926e2c22a0ed..80ef330c0163 100644 --- a/fpicker/source/win32/filepicker/workbench/makefile.mk +++ b/fpicker/source/win32/filepicker/workbench/makefile.mk @@ -36,7 +36,9 @@ TARGETTYPE=CUI .INCLUDE : settings.mk +.IF "$(COM)" == "MSC" CFLAGS+=-GR -GX +.ENDIF # --- Files -------------------------------------------------------- diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx index 8204b51cd930..9f466a5f4af9 100644 --- a/fpicker/source/win32/folderpicker/MtaFop.cxx +++ b/fpicker/source/win32/folderpicker/MtaFop.cxx @@ -34,7 +34,7 @@ #include "MtaFop.hxx" #include <wchar.h> #include <process.h> -#include "..\misc\resourceprovider.hxx" +#include "../misc/resourceprovider.hxx" #include <systools/win32/comtools.hxx> diff --git a/fpicker/source/win32/folderpicker/MtaFop.hxx b/fpicker/source/win32/folderpicker/MtaFop.hxx index 36e4648b05bd..ea06a96b3e2d 100644 --- a/fpicker/source/win32/folderpicker/MtaFop.hxx +++ b/fpicker/source/win32/folderpicker/MtaFop.hxx @@ -46,7 +46,7 @@ #if defined _MSC_VER #pragma warning(pop) #endif -#include "..\misc\WinImplHelper.hxx" +#include "../misc/WinImplHelper.hxx" //---------------------------------------------------------------- // a simple helper class used to provide a buffer for different diff --git a/fpicker/source/win32/folderpicker/makefile.mk b/fpicker/source/win32/folderpicker/makefile.mk index f42ff9685c3c..cc7bf1875037 100644 --- a/fpicker/source/win32/folderpicker/makefile.mk +++ b/fpicker/source/win32/folderpicker/makefile.mk @@ -38,7 +38,9 @@ COMP1TYPELIST=$(TARGET) # --- Files -------------------------------------------------------- # enable rtti +.IF "$(COM)" == "MSC" CFLAGS+=-GR +.ENDIF SLOFILES=$(SLO)$/fopentry.obj\ $(SLO)$/folderpicker.obj\ diff --git a/fpicker/source/win32/folderpicker/workbench/makefile.mk b/fpicker/source/win32/folderpicker/workbench/makefile.mk index 666751f2779d..8429e2dd4cfe 100644 --- a/fpicker/source/win32/folderpicker/workbench/makefile.mk +++ b/fpicker/source/win32/folderpicker/workbench/makefile.mk @@ -36,7 +36,9 @@ TARGETTYPE= CUI .INCLUDE : settings.mk +.IF "$(COM)" == "MSC" CFLAGS+=-GR -EHa +.ENDIF # --- Files -------------------------------------------------------- |