diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-12-12 12:28:13 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-12-12 12:28:13 +0000 |
| commit | 3781b76833a2d853d7890e96a709a70d15f76a44 (patch) | |
| tree | 0cd83fcf64c9fbc3d1520e1cbe4c0e4cf51898e6 /odk/settings | |
| parent | fff7f418876159134096f8881a33f3c741f8904f (diff) | |
INTEGRATION: CWS configure22 (1.23.14); FILE MERGED
2007/10/15 22:46:22 rene 1.23.14.1: #i79874# STLport5 support for configure
Diffstat (limited to 'odk/settings')
| -rw-r--r-- | odk/settings/settings.mk | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 554153ebf879..888ac3921d80 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -289,7 +289,11 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID) SALHELPERLIB=-luno_salhelper$(COMID) REGLIB=-lreg STORELIB=-lstore +ifeq "$(STLPORT_VER)" "500" +STLPORTLIB=-lstlport +else STLPORTLIB=-lstlport_gcc +endif EMPTYSTRING= PATH_SEPARATOR=: @@ -387,7 +391,11 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID) SALHELPERLIB=-luno_salhelper$(COMID) REGLIB=-lreg STORELIB=-lstore +ifeq "$(STLPORT_VER)" "500" +STLPORTLIB=-lstlport -lstdc++ +else STLPORTLIB=-lstlport_gcc -lstdc++ +endif EMPTYSTRING= PATH_SEPARATOR=: @@ -483,7 +491,11 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID) SALHELPERLIB=-luno_salhelper$(COMID) REGLIB=-lreg STORELIB=-lstore +ifeq "$(STLPORT_VER)" "500" +STLPORTLIB=-lstlport +else STLPORTLIB=-lstlport_gcc +endif EMPTYSTRING= PATH_SEPARATOR=: |