diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-06-17 09:08:07 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-06-17 09:08:07 +0000 |
| commit | 1e2e147fe08bae6f26ac1dd0f0c621a7ade60532 (patch) | |
| tree | d94b46fd1f56e2a8a7becad4351ad99104af2acf /cpputools | |
| parent | 7fc866c29cdafa4da353dac84b84f1c75aa1975e (diff) | |
INTEGRATION: CWS sb31 (1.10.24); FILE MERGED
2005/06/10 13:50:50 sb 1.10.24.4: #121392# Made STLport a public part of the URE.
2005/05/04 14:55:04 sb 1.10.24.3: #121392# Fixed platform-dependency of previous fix.
2005/04/28 13:54:01 sb 1.10.24.2: #121392# Include all four UNO runtime libraries, so that C++ UNO components running in the uno executable have a defined environment.
2005/04/18 12:44:46 sb 1.10.24.1: #121392# Change RPATH of uno executable so that it is functional within a URE.
Diffstat (limited to 'cpputools')
| -rw-r--r-- | cpputools/source/unoexe/makefile.mk | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/cpputools/source/unoexe/makefile.mk b/cpputools/source/unoexe/makefile.mk index 594297a25..6cffbecba 100644 --- a/cpputools/source/unoexe/makefile.mk +++ b/cpputools/source/unoexe/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: vg $ $Date: 2003-12-16 11:45:39 $ +# last change: $Author: obo $ $Date: 2005-06-17 10:08:07 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -67,6 +67,12 @@ LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE NO_BSYMBOLIC=TRUE +.IF "$(OS)" == "LINUX" +LINKFLAGSRUNPATH = -Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' +.ELIF "$(OS)" == "SOLARIS" +LINKFLAGSRUNPATH = -R\''$$ORIGIN/../lib:$$ORIGIN'\' +.ENDIF + # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk @@ -108,8 +114,12 @@ DEPOBJFILES=$(OBJ)$/unoexe.obj APP1TARGET=$(TARGET) APP1OBJS=$(DEPOBJFILES) +# Include all four UNO runtime libraries, so that C++ UNO components running in +# the uno executable have a defined environment (stlport is already included via +# APP1STDLIB): APP1STDLIBS= \ $(SALLIB) \ + $(SALHELPERLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) |