diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-07-18 11:34:25 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-07-18 11:34:25 +0000 |
| commit | ba4e43406deaad893e83d8a937370eb3e0c1a194 (patch) | |
| tree | 24f7ddfb6b16cd496bddda17cbf853cf6cbdb713 /cppu/util | |
| parent | f229f4e77364f4f078c20b64980b31112def5753 (diff) | |
INTEGRATION: CWS unomacli64 (1.9.2); FILE MERGED
2007/06/05 15:18:13 kr 1.9.2.1: #i77422# fixed export
Diffstat (limited to 'cppu/util')
| -rw-r--r-- | cppu/util/makefile.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk index 51100cfc6712..41558bb3a9c3 100644 --- a/cppu/util/makefile.mk +++ b/cppu/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: obo $ $Date: 2007-07-17 07:26:47 $ +# last change: $Author: obo $ $Date: 2007-07-18 12:34:25 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -82,11 +82,15 @@ DEF2NAME := $(SHL2TARGET) .IF "$(GUI)$(COM)"=="WNTGCC" SHL2VERSIONMAP:=uno_purpenvhelper$(COMID).map .ELSE +.IF "$(CPUNAME)" == "X86_64" +SHL2VERSIONMAP:=$(SHL2TARGET).$(CPUNAME).map +.ELSE SHL2VERSIONMAP:=$(SHL2TARGET).map +.ENDIF # "$(CPUNAME)" == "X86_64" .ENDIF # "$(GUI)$(COM)"=="WNTGCC" SHL2DEF := $(MISC)$/$(SHL2TARGET).def SHL2IMPLIB := i$(SHL2TARGET) -SHL2STDLIBS := $(CPPULIB) $(SALHELPERLIB) $(SALLIB) +SHL2STDLIBS := $(CPPULIB) $(SALHELPERLIB) $(SALLIB) SHL2OBJS := \ $(SLO)$/helper_purpenv_Environment.obj \ $(SLO)$/helper_purpenv_Mapping.obj \ @@ -106,3 +110,4 @@ ALLTAR: $(SHL2TARGETN) $(SHL2TARGETN): $(SHL1TARGETN) + |