diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-09-07 05:18:42 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-05-19 03:43:23 +0200 |
| commit | 4a32354d48d1250fe761833b065ab2129de351a9 (patch) | |
| tree | 38aef173698c433df20e9fc529c340277015371d /onlineupdate/Executable_mar.mk | |
| parent | make sure that the upload command succeeds (diff) | |
| download | core-4a32354d48d1250fe761833b065ab2129de351a9.tar.gz core-4a32354d48d1250fe761833b065ab2129de351a9.zip | |
store the correct version string in the updater and the mar executable
Change-Id: I52ca969b9fa84320614f77bd51b8aac736478c54
Diffstat (limited to 'onlineupdate/Executable_mar.mk')
| -rw-r--r-- | onlineupdate/Executable_mar.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/onlineupdate/Executable_mar.mk b/onlineupdate/Executable_mar.mk index 628ca2680058..e6f18ef5c8ee 100644 --- a/onlineupdate/Executable_mar.mk +++ b/onlineupdate/Executable_mar.mk @@ -24,6 +24,7 @@ $(eval $(call gb_Executable_use_externals,mar,\ nss3 \ )) + ifeq ($(OS),WNT) $(eval $(call gb_Executable_add_libs,mar,\ ws2_32.lib \ @@ -33,9 +34,16 @@ endif ifeq ($(filter WNT MACOSX,$(OS)),) $(eval $(call gb_Executable_use_externals,mar,nss3)) -$(eval $(call gb_Executable_add_defs,mar,-DMAR_NSS)) + +$(eval $(call gb_Executable_add_defs,mar,\ + -DMAR_NSS \ +)) endif +$(eval $(call gb_Executable_add_defs,mar,\ + -DAPP_VERSION=\"$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\" \ +)) + $(eval $(call gb_Executable_add_cobjects,mar,\ onlineupdate/source/libmar/sign/nss_secutil \ onlineupdate/source/libmar/sign/mar_sign \ |