diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 11:13:46 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 11:13:46 +0000 |
commit | f0986e18df08d4a030f14d795f67648d4046d7d8 (patch) | |
tree | 76ab8ca84993524cb13a3dc213a3a1fc01962a80 /bridges/source/cpp_uno | |
parent | a23800e270e349adfc512a57b0acf0a4bb67ac09 (diff) |
INTEGRATION: CWS sb29 (1.3.68); FILE MERGED
2005/02/01 15:36:20 sb 1.3.68.1: #i41817# When calling from binary UNO to C++, correctly remove from the stack the pointer to a class object return value.
Diffstat (limited to 'bridges/source/cpp_uno')
-rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk index 015297bf9e8c..e72f8a399d20 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk +++ b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: hr $ $Date: 2004-02-03 12:37:41 $ +# last change: $Author: vg $ $Date: 2005-02-21 12:13:46 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -87,7 +87,8 @@ CFLAGSNOOPT=-O0 SLOFILES= \ $(SLO)$/except.obj \ $(SLO)$/cpp2uno.obj \ - $(SLO)$/uno2cpp.obj + $(SLO)$/uno2cpp.obj \ + $(SLO)$/call.obj SHL1TARGET= $(TARGET) @@ -108,3 +109,6 @@ SHL1STDLIBS= \ .INCLUDE : target.mk +$(SLO)$/%.obj: %.s + $(CC) -c -o $(SLO)$/$(@:b).o $< + touch $@ |