From b863abd319b6ef70f831db00db44516344fd5b58 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Wed, 30 Mar 2016 11:44:07 +0200
Subject: [PATCH] UpdCheck added to MSI package

---
 MSI/MSM/Microsoft_VC100_CRT_x64.msmcfg      |   2 +-
 MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg      |   2 +-
 MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg |   2 +-
 MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg |   2 +-
 MSI/MSM/wxMSW_wxbase30u_vc100.msmcfg        |   2 +-
 MSI/MSM/wxMSW_wxbase30u_vc100_x64.msmcfg    |   2 +-
 MSI/MSM/wxMSW_wxbase30ud_vc100.msmcfg       |   2 +-
 MSI/MSM/wxMSW_wxbase30ud_vc100_x64.msmcfg   |   2 +-
 MSI/include/MSIBuildCfg.mak                 | Bin 11364 -> 12508 bytes
 Makefile                                    |   8 ++++++++
 Updater                                     |   2 +-
 11 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/MSI/MSM/Microsoft_VC100_CRT_x64.msmcfg b/MSI/MSM/Microsoft_VC100_CRT_x64.msmcfg
index efed822..caa5620 100644
--- a/MSI/MSM/Microsoft_VC100_CRT_x64.msmcfg
+++ b/MSI/MSM/Microsoft_VC100_CRT_x64.msmcfg
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck
 
 [parametri]
diff --git a/MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg b/MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg
index efed822..caa5620 100644
--- a/MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg
+++ b/MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck
 
 [parametri]
diff --git a/MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg b/MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg
index efed822..caa5620 100644
--- a/MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg
+++ b/MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck
 
 [parametri]
diff --git a/MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg b/MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg
index efed822..caa5620 100644
--- a/MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg
+++ b/MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck
 
 [parametri]
diff --git a/MSI/MSM/wxMSW_wxbase30u_vc100.msmcfg b/MSI/MSM/wxMSW_wxbase30u_vc100.msmcfg
index efed822..caa5620 100644
--- a/MSI/MSM/wxMSW_wxbase30u_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30u_vc100.msmcfg
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck
 
 [parametri]
diff --git a/MSI/MSM/wxMSW_wxbase30u_vc100_x64.msmcfg b/MSI/MSM/wxMSW_wxbase30u_vc100_x64.msmcfg
index efed822..caa5620 100644
--- a/MSI/MSM/wxMSW_wxbase30u_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30u_vc100_x64.msmcfg
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck
 
 [parametri]
diff --git a/MSI/MSM/wxMSW_wxbase30ud_vc100.msmcfg b/MSI/MSM/wxMSW_wxbase30ud_vc100.msmcfg
index efed822..caa5620 100644
--- a/MSI/MSM/wxMSW_wxbase30ud_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30ud_vc100.msmcfg
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck
 
 [parametri]
diff --git a/MSI/MSM/wxMSW_wxbase30ud_vc100_x64.msmcfg b/MSI/MSM/wxMSW_wxbase30ud_vc100_x64.msmcfg
index efed822..caa5620 100644
--- a/MSI/MSM/wxMSW_wxbase30ud_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30ud_vc100_x64.msmcfg
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck
 
 [parametri]
diff --git a/MSI/include/MSIBuildCfg.mak b/MSI/include/MSIBuildCfg.mak
index 86b52b3ad622f4380b1b01748db5658d972a993c..c5bc8e504298ed74948bc12ef105ea3bded15a30 100644
GIT binary patch
delta 284
zcmaD7aVK#@f|7hFLjgkyLn1>7Ln=cNLkt6i@63<^<R>#^Z~m(&%R2dix)5s~P@rV;
zMKw<_uYw_$A!qYNwRlD($%R^mlP{<%v4SNh19_VjG*Unc_}JqakoAN35JeZ&LMKnq
z{DYzfVvHPI4T!IxAp=w=wt1b_Hpa=vc;^_Sx?6$4mmweMk5Yylpfh<HxWG7+A%MY!
j!I2?^!IdG1A%60IZEY1aF$OoF97shdP=zalEm$7_Ws6L5

delta 70
zcmcbU_#|ROg3{y|Wsc3Sls2(!j?oZfoE)Q}GTBa3Wpaa#!sIg=B9rH7-2jU5Ot#bc
P1Es~F@>-k2^fDL$$c!0?

diff --git a/Makefile b/Makefile
index 067b23b..7c533ae 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,10 @@ Clean ::
 	devenv.com "MSI\MSICA\MSICA.sln" /clean "Debug|Win32"
 	devenv.com "MSI\MSICA\MSICA.sln" /clean "Release|x64"
 	devenv.com "MSI\MSICA\MSICA.sln" /clean "Debug|x64"
+	devenv.com "Updater\Updater.sln" /clean "Release|Win32"
+	devenv.com "Updater\Updater.sln" /clean "Debug|Win32"
+	devenv.com "Updater\Updater.sln" /clean "Release|x64"
+	devenv.com "Updater\Updater.sln" /clean "Debug|x64"
 	-if exist "$(OUTPUT_DIR)\Setup\ZRColaEn32.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn32.msi"
 	-if exist "$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi"
 	-if exist "$(OUTPUT_DIR)\Setup\ZRColaEn64.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn64.msi"
@@ -284,18 +288,22 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64D.3.msi"
 "$(OUTPUT_DIR)\ZRColaEn32.3.msi" \
 "$(OUTPUT_DIR)\ZRColaSl32.3.msi" ::
 	devenv.com "MSI\MSICA\MSICA.sln" /build "Release|Win32"
+	devenv.com "Updater\Updater.sln" /build "Release|Win32"
 
 "$(OUTPUT_DIR)\ZRColaEn32D.3.msi" \
 "$(OUTPUT_DIR)\ZRColaSl32D.3.msi" ::
 	devenv.com "MSI\MSICA\MSICA.sln" /build "Debug|Win32"
+	devenv.com "Updater\Updater.sln" /build "Debug|Win32"
 
 "$(OUTPUT_DIR)\ZRColaEn64.3.msi" \
 "$(OUTPUT_DIR)\ZRColaSl64.3.msi" ::
 	devenv.com "MSI\MSICA\MSICA.sln" /build "Release|x64"
+	devenv.com "Updater\Updater.sln" /build "Release|x64"
 
 "$(OUTPUT_DIR)\ZRColaEn64D.3.msi" \
 "$(OUTPUT_DIR)\ZRColaSl64D.3.msi" ::
 	devenv.com "MSI\MSICA\MSICA.sln" /build "Debug|x64"
+	devenv.com "Updater\Updater.sln" /build "Debug|x64"
 
 "$(OUTPUT_DIR)\ZRColaEn32.3.msi" ::
 	cd "MSI\ZRCola"
diff --git a/Updater b/Updater
index a5f71f6..840f1bc 160000
--- a/Updater
+++ b/Updater
@@ -1 +1 @@
-Subproject commit a5f71f696570d85cfa0910d43295dcfbbf85aaf3
+Subproject commit 840f1bce06ef85d2f7f63a6d43c37aa9dc814ba1