INTEGRATION: CWS unomacli64 (1.9.2); FILE MERGED
2007/06/05 15:18:13 kr 1.9.2.1: #i77422# fixed export
This commit is contained in:
parent
f229f4e773
commit
ba4e43406d
1 changed files with 8 additions and 3 deletions
|
@ -4,9 +4,9 @@
|
||||||
#
|
#
|
||||||
# $RCSfile: makefile.mk,v $
|
# $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 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.
|
||||||
|
@ -82,11 +82,15 @@ DEF2NAME := $(SHL2TARGET)
|
||||||
.IF "$(GUI)$(COM)"=="WNTGCC"
|
.IF "$(GUI)$(COM)"=="WNTGCC"
|
||||||
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)
|
||||||
SHL2STDLIBS := $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
|
SHL2STDLIBS := $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
|
||||||
SHL2OBJS := \
|
SHL2OBJS := \
|
||||||
$(SLO)$/helper_purpenv_Environment.obj \
|
$(SLO)$/helper_purpenv_Environment.obj \
|
||||||
$(SLO)$/helper_purpenv_Mapping.obj \
|
$(SLO)$/helper_purpenv_Mapping.obj \
|
||||||
|
@ -106,3 +110,4 @@ ALLTAR: $(SHL2TARGETN)
|
||||||
|
|
||||||
|
|
||||||
$(SHL2TARGETN): $(SHL1TARGETN)
|
$(SHL2TARGETN): $(SHL1TARGETN)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue