diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-24 16:41:19 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-24 16:42:28 +0300 |
| commit | 06c8108fe5c196aec2888d9b236f595f2bcb1c46 (patch) | |
| tree | 264eb643e279cd2b943dcf5d78f72b26aeec56dc /shell/source/all | |
| parent | 58442b0f17a7dd645b29a338d8c936aa36b62bc5 (diff) | |
Attempt to make this build with MinGW
Diffstat (limited to 'shell/source/all')
| -rwxr-xr-x | shell/source/all/makefile.mk | 4 | ||||
| -rwxr-xr-x | shell/source/all/ooofilereader/makefile.mk | 4 |
2 files changed, 8 insertions, 0 deletions
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 -------------------------------------------------------- |