[Libreoffice-commits] core.git: Branch 'feature/mar-updater' - onlineupdate/Executable_updater.mk onlineupdate/Module_onlineupdate.mk onlineupdate/WinResTarget_updater.mk

[Markus Mohrhard]

 onlineupdate/Executable_updater.mk   |    2 ++
 onlineupdate/Module_onlineupdate.mk  |    1 +
 onlineupdate/WinResTarget_updater.mk |   15 +++++++++++++++
 3 files changed, 18 insertions(+)

New commits:
commit 211f7dd2babb097b44f49766bb837b71a65ee999
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Dec 28 02:07:04 2016 +0100

    add the resource to the updater
    
    Change-Id: I80e80708346aa2850b2964c566ebc6423837a9cd

diff --git a/onlineupdate/Executable_updater.mk b/onlineupdate/Executable_updater.mk
index 75d97a3..8d1b9be 100644
--- a/onlineupdate/Executable_updater.mk
+++ b/onlineupdate/Executable_updater.mk
@@ -68,4 +68,6 @@ $(eval $(call gb_Executable_add_exception_objects,updater,\
 		onlineupdate/source/update/updater/win_dirent )\
 ))
 
+$(eval $(call gb_Executable_add_nativeres,updater,updaterres))
+
 # vim:set shiftwidth=4 tabstop=4 noexpandtab: */
diff --git a/onlineupdate/Module_onlineupdate.mk b/onlineupdate/Module_onlineupdate.mk
index 9672d9c..e84a208 100644
--- a/onlineupdate/Module_onlineupdate.mk
+++ b/onlineupdate/Module_onlineupdate.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_Module_add_targets,onlineupdate,\
 	StaticLibrary_updatehelper \
 	$(if $(filter WNT,$(OS)),\
 		Executable_update_service \
+		WinResTarget_updater \
 		StaticLibrary_winhelper )\
 	Executable_mar \
 	Executable_updater \
diff --git a/onlineupdate/WinResTarget_updater.mk b/onlineupdate/WinResTarget_updater.mk
new file mode 100644
index 0000000..f01b3ff
--- /dev/null
+++ b/onlineupdate/WinResTarget_updater.mk
@@ -0,0 +1,15 @@
+$(eval $(call gb_WinResTarget_WinResTarget,updaterres))
+
+$(eval $(call gb_WinResTarget_set_include,updaterres,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/onlineupdate/source/update/common \
+	-I$(SRCDIR)/onlineupdate/source/update/updater \
+))
+
+$(eval $(call gb_WinResTarget_add_dependencies,updaterres, \
+	onlineupdate/source/update/updater/updater.ico \
+))
+
+$(eval $(call gb_WinResTarget_set_rcfile,updaterres, \
+	onlineupdate/source/update/updater/updater \
+))