From 14de0cbd2398eed6ac13b91680b7a6dc6589b4c1 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Fri, 1 Jun 2018 13:34:29 +0200
Subject: [PATCH] Use absolute devenv.com path

---
 MSILocal.mak | Bin 12410 -> 12936 bytes
 Makefile     |  39 +++++++++++++++++++++------------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/MSILocal.mak b/MSILocal.mak
index a2178a0b0fd128661a8f81fb67de3c9285cd26d9..b6007d073e53a2896d29a46723ab6e64d26a9f29 100644
GIT binary patch
delta 962
zcmb7C%Su8~6kQMoMVVoidNniz6(a0GN>XBaEz7!*bw`3qSqPet2~NUkgJ$Oo`hf`i
zfExA(4Vv}=jT^P@RWPCs#evP)ueI0O=X{iIDi6<=jvrZM;KLjO2;l&S(2#<PJdZ}N
zh$L+a+pIfcJVkrVh>9?Kd|2l(x|7&L8mn00eH^2Gq%Bq&nIdOoku!0NSjG~&QdmQw
z!@^56a86rBolqH6Q9}hy-a}|3M$oVc>1TV6wAB9$kl-6Msb9rDnHyU$0%`iX8Pl<d
z2zd_n^1GTa3RGFei7BQ@L1(z40G+WWT9j6!muIYnQ^p$f4D<yLO@XUuP<x&B0#W)|
zlSV<@IUPeJ)qS*FPq=z7^qn7HL1>P$Bs&?ji`$ubQS$hdk^VdXgc4U0tl1P#vl|jL
z&5;mRWlZQ^n-r}#bw`2}S9XbVAR<#v@jg8)sni@=u>Iw4$y5x~+Wy?rQ*IM)u9}pE
hq1-L0=*^Cad$(0m6<1y**|6tDnvELU@9N%w{S$CLm}39{

delta 189
zcmeB3{gtrc1ncG|_7eWdN$et%1;i7;bdaRoWIu5wFxyTR#8#N>p`tf=f`k!No!#UK
zl5$YBF;I10ljleZfYk*^89>$fO^%c1gQ^3XBMs35Hd9(=@&jpzeFEYj^LQqA$nr39
ePEKSOog5_Tg~YRyy#+SINbVYl-mD~_CJX@7F*yVP

diff --git a/Makefile b/Makefile
index 178f23e..df92178 100644
--- a/Makefile
+++ b/Makefile
@@ -24,10 +24,13 @@ PUBLISH_DIR=\\amebis.doma\Splet\WWW\Apache\www.amebis.si-prenos\ZRCola
 PLAT=x64
 REG_FLAGS=/f /reg:64
 REG_FLAGS32=/f /reg:32
+PROGRAM_FILES_32=C:\Program Files (x86)
 !ELSE
 PLAT=Win32
 REG_FLAGS=/f
+PROGRAM_FILES_32=C:\Program Files
 !ENDIF
+DEVENV10=$(PROGRAM_FILES_32)\Microsoft Visual Studio 10.0\Common7\IDE\devenv.com
 
 
 All ::
@@ -36,20 +39,20 @@ Clean ::
 	cd "MSI\MSIBuild\Version"
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean
 	cd "$(MAKEDIR)"
-	devenv.com "ZRCola.sln"          /clean "Release|Win32"
-	devenv.com "ZRCola.sln"          /clean "Debug|Win32"
-	devenv.com "ZRCola.sln"          /clean "Release|x64"
-	devenv.com "ZRCola.sln"          /clean "Debug|x64"
-	devenv.com "ZRColaUtils.sln"     /clean "Release|Win32"
-	devenv.com "ZRColaUtils.sln"     /clean "Debug|Win32"
-	devenv.com "MSI\MSICA\MSICA.sln" /clean "Release|Win32"
-	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"
+	"$(DEVENV10)" "ZRCola.sln"          /clean "Release|Win32"
+	"$(DEVENV10)" "ZRCola.sln"          /clean "Debug|Win32"
+	"$(DEVENV10)" "ZRCola.sln"          /clean "Release|x64"
+	"$(DEVENV10)" "ZRCola.sln"          /clean "Debug|x64"
+	"$(DEVENV10)" "ZRColaUtils.sln"     /clean "Release|Win32"
+	"$(DEVENV10)" "ZRColaUtils.sln"     /clean "Debug|Win32"
+	"$(DEVENV10)" "MSI\MSICA\MSICA.sln" /clean "Release|Win32"
+	"$(DEVENV10)" "MSI\MSICA\MSICA.sln" /clean "Debug|Win32"
+	"$(DEVENV10)" "MSI\MSICA\MSICA.sln" /clean "Release|x64"
+	"$(DEVENV10)" "MSI\MSICA\MSICA.sln" /clean "Debug|x64"
+	"$(DEVENV10)" "Updater\Updater.sln" /clean "Release|Win32"
+	"$(DEVENV10)" "Updater\Updater.sln" /clean "Debug|Win32"
+	"$(DEVENV10)" "Updater\Updater.sln" /clean "Release|x64"
+	"$(DEVENV10)" "Updater\Updater.sln" /clean "Debug|x64"
 	-if exist "$(OUTPUT_DIR)\locale\de_DE\wxstd.mo"        del /f /q "$(OUTPUT_DIR)\locale\de_DE\wxstd.mo"
 	-if exist "$(OUTPUT_DIR)\locale\ru_RU\wxstd.mo"        del /f /q "$(OUTPUT_DIR)\locale\ru_RU\wxstd.mo"
 	-if exist "$(OUTPUT_DIR)\locale\sl_SI\wxstd.mo"        del /f /q "$(OUTPUT_DIR)\locale\sl_SI\wxstd.mo"
@@ -338,28 +341,28 @@ Localization :: \
 "$(OUTPUT_DIR)\Win32.Release\stdex10u_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Release\wxExtend10u_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Release\ZRCola.exe" ::
-	devenv.com "ZRCola.sln" /build "Release|Win32"
+	"$(DEVENV10)" "ZRCola.sln" /build "Release|Win32"
 
 "$(OUTPUT_DIR)\Win32.Debug\libZRCola10ud_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Debug\libZRColaUI10ud_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Debug\stdex10ud_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Debug\wxExtend10ud_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Debug\ZRCola.exe" ::
-	devenv.com "ZRCola.sln" /build "Debug|Win32"
+	"$(DEVENV10)" "ZRCola.sln" /build "Debug|Win32"
 
 "$(OUTPUT_DIR)\x64.Release\libZRCola10u_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Release\libZRColaUI10u_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Release\stdex10u_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Release\wxExtend10u_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Release\ZRCola.exe" ::
-	devenv.com "ZRCola.sln" /build "Release|x64"
+	"$(DEVENV10)" "ZRCola.sln" /build "Release|x64"
 
 "$(OUTPUT_DIR)\x64.Debug\libZRCola10ud_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Debug\libZRColaUI10ud_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Debug\stdex10ud_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Debug\wxExtend10ud_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Debug\ZRCola.exe" ::
-	devenv.com "ZRCola.sln" /build "Debug|x64"
+	"$(DEVENV10)" "ZRCola.sln" /build "Debug|x64"
 
 "$(OUTPUT_DIR)\ZRCola32.ddf" : \
 #	"$(OUTPUT_DIR)\ZRCola.de_DE.32.2.msi" \