[Libreoffice-commits] .: 2 commits - salhelper/source store/prj store/util

[Tor Lillqvist]

 salhelper/source/makefile.mk |    5 +++--
 store/prj/d.lst              |    1 +
 store/util/makefile.mk       |    4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit a5d64ad12cbd6a1f3059565736a4e7f0d8e09c0c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed May 25 01:23:32 2011 +0300

    Use special DLL and library name just for MSC

diff --git a/store/prj/d.lst b/store/prj/d.lst
index e39be09..0cc1fc6 100644
--- a/store/prj/d.lst
+++ b/store/prj/d.lst
@@ -5,6 +5,7 @@ mkdir: %_DEST%\inc%_EXT%\store
 ..\util\store.xml %_DEST%\xml%_EXT%\store.xml
 
 ..\%__SRC%\lib\istore.lib %_DEST%\lib%_EXT%\istore.lib
+..\%__SRC%\lib\libstore*.dll.a %_DEST%\lib%_EXT%\libstore*.dll.a
 ..\%__SRC%\lib\libstore.*.* %_DEST%\lib%_EXT%\*
 ..\%__SRC%\bin\sto*.dll %_DEST%\bin%_EXT%\sto*.dll
 
diff --git a/store/util/makefile.mk b/store/util/makefile.mk
index 492f54c..5129273 100644
--- a/store/util/makefile.mk
+++ b/store/util/makefile.mk
@@ -56,7 +56,11 @@ LIB1FILES=	$(LB)$/store.lib
 # --- Shared-Library ---
 
 SHL1TARGET= 	$(TARGET)
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB= 	istore
+.ELSE
+SHL1IMPLIB= 	store$(UDK_MAJOR)
+.ENDIF
 
 SHL1VERSIONMAP=	$(TARGET).map
 
commit 55dad1da7a67281c763961bdbdd271eb9404e120
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed May 25 01:21:39 2011 +0300

    Use simpler DLL and library names in the WNTGCC case

diff --git a/salhelper/source/makefile.mk b/salhelper/source/makefile.mk
index 434f266..8c7d8a2 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