mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pathutils-obj is in static library ooopathutils

Browse Source
This commit is contained in:
Matúš Kukan
2012-01-10 18:28:11 +01:00
parent 92ac10d4ec
commit 9af656af19
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/Executable_nsplugin.mk
View File

@@ -56,14 +56,14 @@ $(eval $(call gb_Executable_add_linked_libs,nsplugin,\
)) ))
ifeq ($(GUI),WNT) ifeq ($(GUI),WNT)
$(eval $(call gb_Executable_add_ldflags,nsplugin,\
$(OUTDIR)/lib/pathutils-obj.obj \
))
$(eval $(call gb_Executable_add_exception_objects,nsplugin,\ $(eval $(call gb_Executable_add_exception_objects,nsplugin,\
extensions/source/nsplugin/source/nsp_windows \ extensions/source/nsplugin/source/nsp_windows \
)) ))
$(eval $(call gb_Executable_add_linked_static_libs,nsplugin,\
ooopathutils \
))
$(eval $(call gb_Executable_add_linked_libs,nsplugin,\ $(eval $(call gb_Executable_add_linked_libs,nsplugin,\
ws2_32 \ ws2_32 \
shell32 \ shell32 \

5
extensions/Library_npsoplugin.mk
View File

@@ -59,10 +59,13 @@ endif # GUI=UNX
ifeq ($(GUI),WNT) ifeq ($(GUI),WNT)
$(eval $(call gb_Library_add_ldflags,npsoplugin,\ $(eval $(call gb_Library_add_ldflags,npsoplugin,\
$(OUTDIR)/lib/pathutils-obj.obj \
$(OUTDIR)/lib/npwin.obj \ $(OUTDIR)/lib/npwin.obj \
)) ))
$(eval $(call gb_Library_add_linked_static_libs,npsoplugin,\
ooopathutils \
))
$(eval $(call gb_Library_add_linked_libs,npsoplugin,\ $(eval $(call gb_Library_add_linked_libs,npsoplugin,\
ws2_32 \ ws2_32 \
shell32 \ shell32 \