diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 11:32:21 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 11:32:21 +0000 |
| commit | ea7c546846e2e9f5bb4b60af959b85e7944abeb0 (patch) | |
| tree | e438d88a76b19ed049baf3cccd0a2851890a0499 /solenv/inc/unxsoli4.mk | |
| parent | e1755f5bd700893d7edaab6abe395d94b355df65 (diff) | |
INTEGRATION: CWS tl32 (1.22.16); FILE MERGED
2007/04/11 10:23:09 tl 1.22.16.4: RESYNC: (1.28-1.32); FILE MERGED
2007/01/29 14:44:27 tl 1.22.16.3: RESYNC: (1.25-1.28); FILE MERGED
2006/12/01 12:03:26 tl 1.22.16.2: #i69286# merge conflict solved
2006/11/03 11:42:03 tl 1.22.16.1: #i69286# #140479# warning-free code for linguistic, lingu and starmath
Diffstat (limited to 'solenv/inc/unxsoli4.mk')
| -rw-r--r-- | solenv/inc/unxsoli4.mk | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk index d570f70b6637..a195209535a3 100644 --- a/solenv/inc/unxsoli4.mk +++ b/solenv/inc/unxsoli4.mk @@ -4,9 +4,9 @@ # # $RCSfile: unxsoli4.mk,v $ # -# $Revision: 1.33 $ +# $Revision: 1.34 $ # -# last change: $Author: ihi $ $Date: 2007-04-17 10:14:03 $ +# last change: $Author: vg $ $Date: 2007-05-25 12:32:21 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -111,11 +111,10 @@ MODULES_WITH_WARNINGS := \ chart2 \ devtools \ extensions \ - lingu \ r_tools \ soldep \ - starmath \ - sw + sw \ + xmlsecurity STDOBJVCL=$(L)$/salmain.o @@ -230,10 +229,10 @@ DLLPOST=.so LDUMP=cppfilt /b /n /o /p -CFLAGSCXXSLO += -CFLAGSCXXOBJ += +CFLAGSCXXSLO += +CFLAGSCXXOBJ += -LINKFLAGSAPPGUI+= -LINKFLAGSSHLGUI+= -LINKFLAGSAPPCUI+= -LINKFLAGSSHLCUI+= +LINKFLAGSAPPGUI+= +LINKFLAGSSHLGUI+= +LINKFLAGSAPPCUI+= +LINKFLAGSSHLCUI+= |