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

INTEGRATION: CWS cmcfixes38 (1.12.6); FILE MERGED

Browse source 
2007/10/15 11:08:48 cmc 1.12.6.1: #i80735# merge 32bit and 64bit gcc maps, but let windows gcc do its own thing
This commit is contained in:
Rüdiger Timm 2007-11-06 14:03:41 +00:00
parent c11ff2dbae
commit ac89d49e6b
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cppu/util/makefile.mk
View file

@ -4,9 +4,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.14 $ # $Revision: 1.15 $
# #
# last change: $Author: hr $ $Date: 2007-11-02 12:54:21 $ # last change: $Author: rt $ $Date: 2007-11-06 15:03:41 $
# #
# The Contents of this file are made available subject to # The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1. # the terms of GNU Lesser General Public License Version 2.1.
@ -83,11 +83,7 @@ DEF2NAME := $(SHL2TARGET)
.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2" .IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
SHL2VERSIONMAP:=uno_purpenvhelper$(COMID).map SHL2VERSIONMAP:=uno_purpenvhelper$(COMID).map
.ELSE .ELSE
.IF "$(CPUNAME)" == "X86_64"
SHL2VERSIONMAP:=$(SHL2TARGET).$(CPUNAME).map
.ELSE
SHL2VERSIONMAP:=$(SHL2TARGET).map SHL2VERSIONMAP:=$(SHL2TARGET).map
.ENDIF # "$(CPUNAME)" == "X86_64"
.ENDIF # "$(GUI)$(COM)"=="WNTGCC" .ENDIF # "$(GUI)$(COM)"=="WNTGCC"
SHL2DEF := $(MISC)$/$(SHL2TARGET).def SHL2DEF := $(MISC)$/$(SHL2TARGET).def
SHL2IMPLIB := i$(SHL2TARGET) SHL2IMPLIB := i$(SHL2TARGET)