diff options
| author | Release Engineers <releng@openoffice.org> | 2009-04-10 09:52:21 +0000 |
|---|---|---|
| committer | Release Engineers <releng@openoffice.org> | 2009-04-10 09:52:21 +0000 |
| commit | 47d435c60443ed74863926b246016f4fe26482c1 (patch) | |
| tree | 45f711a604f01b9ae7c820d48b8bac5b22b437a5 /hunspell | |
| parent | e1a5de62cda8a902d6d616e46c9ee5fb20539ae0 (diff) | |
CWS-TOOLING: integrate CWS mingwport18
2009-03-27 12:51:41 +0100 tono r270150 : CWS-TOOLING: rebase CWS mingwport18 to trunk@270033 (milestone: DEV300:m45)
2009-03-26 22:41:14 +0100 tono r270120 : files with invalid names removed
2009-03-26 22:40:11 +0100 tono r270119 : files with invalid names removed
2009-03-26 22:39:04 +0100 tono r270118 : files with invalid names removed
2009-03-26 22:36:00 +0100 tono r270117 : files with invalid names removed
2009-03-26 22:33:42 +0100 tono r270116 : files with invalid names removed
2009-03-26 22:32:14 +0100 tono r270115 : files with invalid names removed
2009-03-26 22:24:41 +0100 tono r270114 : files with invalid names removed
2009-03-26 22:16:41 +0100 tono r270113 : files with invalid names removed
2009-03-26 22:15:52 +0100 tono r270112 : files with invalid names removed
2009-03-26 22:14:44 +0100 tono r270111 : files with invalid names removed
2009-03-26 22:12:28 +0100 tono r270110 : files with invalid names removed
2009-03-26 21:46:31 +0100 tono r270109 : files with invalid names removed
2009-03-22 12:41:21 +0100 tono r269847 : i#100463: MinGW port header patch enhancement
2009-03-22 12:39:39 +0100 tono r269846 : i#100462: MinGW port update for python
2009-03-22 12:37:52 +0100 tono r269845 : i#100461: MinGW port fix for store/workben
2009-03-22 12:36:10 +0100 tono r269844 : i#100460: MinGW port fix for sal when debug=true
2009-03-21 01:06:50 +0100 tono r269833 : i#100210: MinGW port fix for hunspell-1.2.8
2009-03-21 01:04:08 +0100 tono r269832 : i#100209: MinGW port fix for sspi
Diffstat (limited to 'hunspell')
| -rw-r--r-- | hunspell/hunspell-1.2.8.patch | 14 | ||||
| -rw-r--r-- | hunspell/makefile.mk | 7 |
2 files changed, 19 insertions, 2 deletions
diff --git a/hunspell/hunspell-1.2.8.patch b/hunspell/hunspell-1.2.8.patch index 9b14f9b86fe3..a1e5a356e388 100644 --- a/hunspell/hunspell-1.2.8.patch +++ b/hunspell/hunspell-1.2.8.patch @@ -475,7 +475,17 @@ #ifndef HUNSPELL_EXTRA #define suggest_auto suggest #endif -@@ -98,8 +108,10 @@ +@@ -28,7 +38,9 @@ + + #ifdef WIN32 + ++#ifndef __MINGW32__ + #define gettext ++#endif + #define LIBDIR "C:\\Hunspell\\" + #define USEROOODIR "Application Data\\OpenOffice.org 2\\user\\wordbook" + #define OOODIR \ +@@ -98,8 +110,10 @@ #if ENABLE_NLS #ifdef HAVE_LOCALE_H #include <locale.h> @@ -486,7 +496,7 @@ #ifdef HAVE_LIBINTL_H #include <libintl.h> -@@ -1385,9 +1397,11 @@ +@@ -1385,9 +1399,11 @@ #ifdef HAVE_LOCALE_H ui_lang = setlocale(LC_ALL, ""); textdomain("hunspell"); diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk index bb11a95f3cce..c8d8d5c91a41 100644 --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -71,7 +71,14 @@ OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.2.a .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +CONFIGURE_ACTION=configure +CONFIGURE_FLAGS= --disable-shared --with-pic +BUILD_ACTION=make +OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.2.a +.ELSE BUILD_ACTION=cd src/hunspell && dmake +.ENDIF .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="OS2" |