summaryrefslogtreecommitdiff
path: root/salhelper/source
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-05-25 01:21:39 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-05-25 01:25:44 +0300
commita2b86d4e2db3ddbf2a4678863d3fe5e7a0b745ff (patch)
tree516a21bc4dabb71c639be6f8c3a230c2eec008d6 /salhelper/source
parent71d97cfc1eaf17cb35e4c00231c5b9e8af536713 (diff)
Use simpler DLL and library names in the WNTGCC case
Diffstat (limited to 'salhelper/source')
-rw-r--r--salhelper/source/makefile.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/salhelper/source/makefile.mk b/salhelper/source/makefile.mk
index 434f266ca0bf..8c7d8a2c0963 100644
--- a/salhelper/source/makefile.mk
+++ b/salhelper/source/makefile.mk
@@ -49,16 +49,17 @@ SLOFILES= \
$(SLO)$/simplereferenceobject.obj \
$(SLO)$/timer.obj
-.IF "$(GUI)" == "WNT"
+.IF "$(COM)" == "MSC"
SHL1TARGET= $(TARGET)$(UDK_MAJOR)$(COMID)
+SHL1IMPLIB= i$(TARGET)
.ELSE
SHL1TARGET= uno_$(TARGET)$(COMID)
+SHL1IMPLIB= $(SHL1TARGET)
.ENDIF
SHL1STDLIBS=$(SALLIB)
SHL1DEPN=
-SHL1IMPLIB= i$(TARGET)
SHL1LIBS= $(SLB)$/$(TARGET).lib
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
SHL1RPATH= URELIB