diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2010-01-21 10:44:28 +0000 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2010-01-21 10:44:28 +0000 |
| commit | ce9a24eb4b1fd0a7db45d9892504fb4b2736f984 (patch) | |
| tree | 78f536ad46638c976126d05458da53631c918193 /hyphen | |
| parent | 94bc4993ff06e14dd586d9f402aaf3fcfc904776 (diff) | |
| parent | b24cbcb51b47d8e71f651c93d9247e63cd85f9ed (diff) | |
xmlsec1_2_14: merge with DEV300 m70
Diffstat (limited to 'hyphen')
| -rw-r--r-- | hyphen/hyphen-2.4.patch | 3 | ||||
| -rw-r--r-- | hyphen/prj/build.lst | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/hyphen/hyphen-2.4.patch b/hyphen/hyphen-2.4.patch index 27f7085946a3..5aef3422d22a 100644 --- a/hyphen/hyphen-2.4.patch +++ b/hyphen/hyphen-2.4.patch @@ -110,7 +110,7 @@ diff -u misc/hyphen-2.4/Makefile.in misc/build/hyphen-2.4/Makefile.in diff -u misc/hyphen-2.4/makefile.mk misc/build/hyphen-2.4/makefile.mk --- misc/hyphen-2.4/makefile.mk 2008-06-04 10:43:21.000000000 +0200 +++ misc/build/hyphen-2.4/makefile.mk 2008-06-04 12:40:46.000000000 +0200 -@@ -1 +1,57 @@ +@@ -1 +1,58 @@ -dummy +#************************************************************************* +# @@ -151,6 +151,7 @@ diff -u misc/hyphen-2.4/makefile.mk misc/build/hyphen-2.4/makefile.mk + +USE_DEFFILE=TRUE +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++UWINAPILIB=
+ +.INCLUDE : settings.mk + diff --git a/hyphen/prj/build.lst b/hyphen/prj/build.lst index dbb21f3325ab..c953a5725f70 100644 --- a/hyphen/prj/build.lst +++ b/hyphen/prj/build.lst @@ -1,3 +1,3 @@ -hyp hyphen : solenv sal NULL +hyp hyphen : soltools solenv NULL hyp hyphen usr1 - all hyp_mkout NULL hyp hyphen nmake - all hyp_hyphen NULL |