diff options
Diffstat (limited to 'salhelper')
| -rw-r--r-- | salhelper/source/makefile.mk | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/salhelper/source/makefile.mk b/salhelper/source/makefile.mk index 2ef508c196e7..e8044876676c 100644 --- a/salhelper/source/makefile.mk +++ b/salhelper/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.20 $ +# $Revision: 1.21 $ # -# last change: $Author: hr $ $Date: 2004-09-09 11:44:52 $ +# last change: $Author: pjunck $ $Date: 2004-11-03 09:10:56 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -92,11 +92,11 @@ SLOFILES= \ SLOFILES+=$(SLO)$/staticmb.obj .ENDIF -.IF "$(UNIXVERSIONNAMES)" != "" +.IF "$(GUI)" == "WNT" SHL1TARGET= $(TARGET)$(COMID) .ELSE -SHL1TARGET= $(TARGET)$(UDK_MAJOR)$(COMID) -.ENDIF # UNIXVERSIONNAMES +SHL1TARGET= uno_$(TARGET)$(COMID) +.ENDIF SHL1STDLIBS=$(SALLIB) @@ -111,12 +111,8 @@ DEF1NAME= $(SHL1TARGET) SHL1VERSIONMAP=msci.map .ELIF "$(COMNAME)"=="sunpro5" SHL1VERSIONMAP=sols.map -.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc2" -SHL1VERSIONMAP=lngi.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" SHL1VERSIONMAP=gcc3_linux_intel.map -.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2" -SHL1VERSIONMAP=lngi.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3" SHL1VERSIONMAP=gcc3_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXSgcc3" |