strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Introduce gb_Executable_add_default_nativeres to add version resource

Browse source 
... to executables on Windows

Change-Id: I31bd2447052915bb299820034f99128e0e97db54
Reviewed-on: https://gerrit.libreoffice.org/78290
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski 2019-08-30 13:29:56 +03:00
parent 4b4b1689db
commit e607beeed1
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shell/Executable_spsupp_helper.mk
View file

@ -30,6 +30,8 @@ $(eval $(call gb_Executable_add_exception_objects,spsupp_helper,\
$(eval $(call gb_Executable_add_nativeres,spsupp_helper,spsupp_dlg))
$(eval $(call gb_Executable_add_default_nativeres,spsupp_helper))
$(eval $(call gb_Executable_use_system_win32_libs,spsupp_helper,\
shell32 \
))

17
solenv/gbuild/platform/com_MSC_class.mk
View file

@ -328,6 +328,23 @@ $(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_targ
endef
define gb_Executable_add_default_nativeres
$(call gb_WinResTarget_WinResTarget_init,$(1)/default)
$(call gb_WinResTarget_set_rcfile,$(1)/default,include/default)
$(call gb_WinResTarget_add_defs,$(1)/default,\
-DVERVARIANT="$(LIBO_VERSION_PATCH)" \
-DRES_APP_VENDOR="$(OOO_VENDOR)" \
-DORG_NAME="$(call gb_Executable_get_filename,$(1))"\
-DINTERNAL_NAME="$(subst $(gb_Executable_EXT),,$(call gb_Executable_get_filename,$(1)))" \
-DADDITIONAL_VERINFO1="" \
-DADDITIONAL_VERINFO2="" \
-DADDITIONAL_VERINFO3="" \
)
$(call gb_Executable_add_nativeres,$(1),$(1)/default)
$(call gb_Executable_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(1)/default)
endef
define gb_LinkTarget_add_nativeres
$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2))
$(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_target,$(2))