[Libreoffice-commits] .: 2 commits - registry/tools salhelper/prj

[Tor Lillqvist]

 registry/tools/makefile.mk |    4 ++++
 salhelper/prj/d.lst        |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit c58c0775bc05994891dcac3a4269f4fe406a5dfb
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu May 26 00:56:25 2011 +0300

    Would be pointless to build tool executables for iOS

diff --git a/registry/tools/makefile.mk b/registry/tools/makefile.mk
index 06ca753..6a759b1 100644
--- a/registry/tools/makefile.mk
+++ b/registry/tools/makefile.mk
@@ -39,6 +39,8 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE :  ..$/version.mk
 
+.IF "$(OS)"!="IOS"
+
 # --- Files --------------------------------------------------------
 CDEFS += -DDLL_VERSION=$(EMQ)"$(DLLPOSTFIX)$(EMQ)"
 
@@ -85,4 +87,6 @@ APP5STDLIBS=\
 
 OBJFILES = $(APP1OBJS) $(APP2OBJS) $(APP3OBJS) $(APP4OBJS) $(APP5OBJS)
 
+.ENDIF
+
 .INCLUDE :  target.mk
commit 981a459575beaa5ec412609dccb5dbe265100dea
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu May 26 00:51:49 2011 +0300

    Match also name of the static library built for iOS

diff --git a/salhelper/prj/d.lst b/salhelper/prj/d.lst
index a0769a4..7a54bac 100644
--- a/salhelper/prj/d.lst
+++ b/salhelper/prj/d.lst
@@ -15,7 +15,7 @@ mkdir: %_DEST%\inc%_EXT%\salhelper
 ..\%__SRC%\bin\salhelp*.dll %_DEST%\bin%_EXT%\salhelp*.dll
 ..\%__SRC%\lib\*salhelper*.lib %_DEST%\lib%_EXT%\*
 
-..\%__SRC%\lib\libuno_salhelper*.*.* %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\libuno_salhelper*.* %_DEST%\lib%_EXT%\*
 
 ..\%__SRC%\lib\libsalhelper*.a %_DEST%\lib%_EXT%\*
 ..\%__SRC%\lib\salhelper*.lib %_DEST%\lib%_EXT%\*