[Libreoffice-commits] .: Branch 'feature/gbuild_extensions' - 2 commits - extensions/Executable_nsplugin.mk solenv/gbuild

[Matus Kukan]

 extensions/Executable_nsplugin.mk       |   24 +++++++++---------------
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |    1 +
 2 files changed, 10 insertions(+), 15 deletions(-)

New commits:
commit 4ee82ce8aeb36673301b631e94f80f725eecc362
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Dec 19 20:58:22 2011 +0100

    extensions: nsplugin: tweak linked libraries

diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk
index 6b97d46..49b8761 100644
--- a/extensions/Executable_nsplugin.mk
+++ b/extensions/Executable_nsplugin.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
@@ -46,21 +46,15 @@ $(eval $(call gb_Executable_add_linked_libs,nsplugin,\
 	cppu \
 	cppuhelper \
 	sal \
+	$(if $(filter $(GUI),UNX), \
+		dl \
+	) \
+	$(if $(filter $(OS),SOLARIS), \
+		nsl \
+		socket \
+	) \
 ))
 
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_linked_libs,nsplugin,\
-	dl \
-))
-endif
-
-ifeq ($(OS),SOLARIS)
-$(eval $(call gb_Executable_add_libs,nsplugin,\
-	-lsocket \
-	-lnsl \
-))
-endif
-
 ifeq ($(GUI),WNT)
 $(eval $(call gb_Executable_add_ldflags,nsplugin,\
 	$(OUTDIR)/lib/pathutils-obj.obj \
@@ -85,4 +79,4 @@ $(eval $(call gb_Executable_add_linked_libs,nsplugin,\
 ))
 endif # WNT
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim: set noet sw=4 ts=4:
commit a705718a7d95c8e1abc22fcc57ddb84e5b18aa0a
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Dec 19 20:52:02 2011 +0100

    gbuild: register ws2_32 also for MSVC

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 1e068ff..de562a7 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -426,6 +426,7 @@ gb_Library_PLAINLIBS_NONE += \
 	version \
 	winmm \
 	winspool \
+	ws2_32 \
 
 gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \