From a2b86d4e2db3ddbf2a4678863d3fe5e7a0b745ff Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@novell.com>
Date: Wed, 25 May 2011 01:21:39 +0300
Subject: Use simpler DLL and library names in the WNTGCC case

---
 salhelper/source/makefile.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'salhelper')

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
-- 
cgit