strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS sb31 (1.10.24); FILE MERGED

Browse source 
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.
This commit is contained in:
Oliver Bolte 2005-06-17 09:08:07 +00:00
parent 2c9df7dfa8
commit 695b24b14b
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cpputools/source/unoexe/makefile.mk
View file

@ -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)