summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--extensions/Executable_nsplugin.mk8
-rw-r--r--extensions/Library_npsoplugin.mk5
2 files changed, 8 insertions, 5 deletions
diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk
index 6bc58fb99a37..383db0005ace 100644
--- a/extensions/Executable_nsplugin.mk
+++ b/extensions/Executable_nsplugin.mk
@@ -56,14 +56,14 @@ $(eval $(call gb_Executable_add_linked_libs,nsplugin,\
))
ifeq ($(GUI),WNT)
-$(eval $(call gb_Executable_add_ldflags,nsplugin,\
- $(OUTDIR)/lib/pathutils-obj.obj \
-))
-
$(eval $(call gb_Executable_add_exception_objects,nsplugin,\
extensions/source/nsplugin/source/nsp_windows \
))
+$(eval $(call gb_Executable_add_linked_static_libs,nsplugin,\
+ ooopathutils \
+))
+
$(eval $(call gb_Executable_add_linked_libs,nsplugin,\
ws2_32 \
shell32 \
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index f542f59445fd..1a30d13532d1 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -59,10 +59,13 @@ endif # GUI=UNX
ifeq ($(GUI),WNT)
$(eval $(call gb_Library_add_ldflags,npsoplugin,\
- $(OUTDIR)/lib/pathutils-obj.obj \
$(OUTDIR)/lib/npwin.obj \
))
+$(eval $(call gb_Library_add_linked_static_libs,npsoplugin,\
+ ooopathutils \
+))
+
$(eval $(call gb_Library_add_linked_libs,npsoplugin,\
ws2_32 \
shell32 \