diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-12-12 12:19:04 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-12-12 12:19:04 +0000 |
| commit | e9cdb18e5df593b0b47d66f7552238d06b040ef8 (patch) | |
| tree | 75e2ab6e22d6d6e47cc6b76cdc3a4ff72cf163ab /solenv/inc/unxfbsd.mk | |
| parent | 12897dc51e036666cba10affda2f30682c8f18e1 (diff) | |
INTEGRATION: CWS configure22 (1.4.128); FILE MERGED
2007/11/14 21:10:03 rene 1.4.128.2: RESYNC: (1.4-1.5); FILE MERGED
2007/10/15 22:46:22 rene 1.4.128.1: #i79874# STLport5 support for configure
Diffstat (limited to 'solenv/inc/unxfbsd.mk')
| -rw-r--r-- | solenv/inc/unxfbsd.mk | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/solenv/inc/unxfbsd.mk b/solenv/inc/unxfbsd.mk index fd7299d268e3..4cf2666ab885 100644 --- a/solenv/inc/unxfbsd.mk +++ b/solenv/inc/unxfbsd.mk @@ -4,9 +4,9 @@ # # $RCSfile: unxfbsd.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: vg $ $Date: 2007-10-15 12:40:17 $ +# last change: $Author: kz $ $Date: 2007-12-12 13:19:03 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -192,11 +192,21 @@ STDSHLCUIMT=$(PTHREAD_LIBS) -lm LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive .IF "$(USE_STLP_DEBUG)" != "" +.IF "$(STLPORT_VER)" >= "500" +LIBSTLPORT=$(DYNAMIC) -lstlportstlg +LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC) +.ELSE LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC) +.ENDIF .ELSE # "$(USE_STLP_DEBUG)" != "" +.IF "$(STLPORT_VER)" >= "500" +LIBSTLPORT=$(DYNAMIC) -lstlport +LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) +.ELSE LIBSTLPORT=$(DYNAMIC) -lstlport_gcc LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) +.ENDIF .ENDIF # "$(USE_STLP_DEBUG)" != "" #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) |