diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-03-15 08:57:50 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-03-15 08:57:50 +0000 |
| commit | 2daf4afcf8b1f707b37efbd8b87dd4b7d4f7a648 (patch) | |
| tree | c925b35db080f47dadbeae6f115027e35ed61010 | |
| parent | c8f1d001220cd0b6062b059367a71a44902f9c1f (diff) | |
INTEGRATION: CWS ause019 (1.4.10); FILE MERGED
2005/03/14 11:12:42 hjs 1.4.10.1: #i42716# solaris/gcc
| -rw-r--r-- | solenv/inc/unxsogi.mk | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/solenv/inc/unxsogi.mk b/solenv/inc/unxsogi.mk index 3a717c6b75ba..d4c173630b52 100644 --- a/solenv/inc/unxsogi.mk +++ b/solenv/inc/unxsogi.mk @@ -2,9 +2,9 @@ # # $RCSfile: unxsogi.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: kz $ $Date: 2005-03-03 17:37:30 $ +# last change: $Author: obo $ $Date: 2005-03-15 09:57:50 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -107,7 +107,9 @@ CFLAGSOUTOBJ=-o STATIC = -Wl,-Bstatic DYNAMIC = -Wl,-Bdynamic -LINK=gcc +LINK*=$(CXX) +LINKC*=$(CC) + LINKFLAGS= LINKFLAGSAPPGUI=-Wl,-export-dynamic LINKFLAGSSHLGUI=-shared @@ -135,15 +137,15 @@ STDSLOGUI= STDOBJCUI= STDSLOCUI= -STDLIBGUIST=$(DYNAMIC) -lstdc++ -lm -STDLIBCUIST=$(DYNAMIC) -lstdc++ -lm -STDLIBGUIMT=$(DYNAMIC) -lpthread -lthread -lstdc++ -lm -STDLIBCUIMT=$(DYNAMIC) -lpthread -lthread -lstdc++ -lm +STDLIBGUIST=$(DYNAMIC) -lm +STDLIBCUIST=$(DYNAMIC) -lm +STDLIBGUIMT=$(DYNAMIC) -lpthread -lthread -lm +STDLIBCUIMT=$(DYNAMIC) -lpthread -lthread -lm # libraries for linking shared libraries -STDSHLGUIST=$(DYNAMIC) -lstdc++ -lm -STDSHLCUIST=$(DYNAMIC) -lstdc++ -lm -STDSHLGUIMT=$(DYNAMIC) -lpthread -lthread -lstdc++ -lm -STDSHLCUIMT=$(DYNAMIC) -lpthread -lthread -lstdc++ -lm +STDSHLGUIST=$(DYNAMIC) -lm +STDSHLCUIST=$(DYNAMIC) -lm +STDSHLGUIMT=$(DYNAMIC) -lpthread -lthread -lm +STDSHLCUIMT=$(DYNAMIC) -lpthread -lthread -lm STDLIBGUIST+=-lX11 STDLIBGUIMT+=-lX11 |