Author: damjan
Date: Sat Dec 24 16:48:58 2016
New Revision: 1775984
URL: http://svn.apache.org/viewvc?rev=1775984&view=rev
Log:
Fix a serious fpicker regression on Windows, where
the "open file" button / menu option does nothing,
caused by the resouce file not getting linked to
fps.dll after the port to gbuild. Also use "fps"
instead of "fpicker" in the WinResTarget file, since
it has to match the library name, not the module
name.
Patch by: me
Modified:
openoffice/trunk/main/fpicker/Library_fps.mk
openoffice/trunk/main/fpicker/WinResTarget_fpicker.mk
Modified: openoffice/trunk/main/fpicker/Library_fps.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/Library_fps.mk?rev=1775984&r1=1775983&r2=1775984&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/Library_fps.mk (original)
+++ openoffice/trunk/main/fpicker/Library_fps.mk Sat Dec 24 16:48:58 2016
@@ -103,4 +103,6 @@ $(eval $(call gb_Library_add_cxxobjects,
))
endif
+$(eval $(call gb_Library_add_nativeres,fps,src))
+
# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/fpicker/WinResTarget_fpicker.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/WinResTarget_fpicker.mk?rev=1775984&r1=1775983&r2=1775984&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/WinResTarget_fpicker.mk (original)
+++ openoffice/trunk/main/fpicker/WinResTarget_fpicker.mk Sat Dec 24 16:48:58
2016
@@ -21,13 +21,13 @@
-$(eval $(call gb_WinResTarget_WinResTarget,fpicker/src))
+$(eval $(call gb_WinResTarget_WinResTarget,fps/src))
-$(eval $(call gb_WinResTarget_set_include,fpicker/src,\
+$(eval $(call gb_WinResTarget_set_include,fps/src,\
$$(INCLUDE) \
-I$(SRCDIR)/fpicker/inc \
))
-$(eval $(call gb_WinResTarget_add_file,fpicker/src,\
+$(eval $(call gb_WinResTarget_add_file,fps/src,\
fpicker/source/win32/filepicker/Fps \
))
