updates for windows packaging

xor-musix · Jan 27, 2021 · 70b5f10 · 70b5f10
1 parent 3f9819e
commit 70b5f10
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/Packaging/Windows/ctrlr.nsi b/Packaging/Windows/ctrlr.nsi
@@ -104,14 +104,14 @@ SectionGroup /e "Standalone" PROG1
 
 	Section "32bit binary" SEC1
 		SetOutPath 	"$INSTDIR"
-		File			"..\..\Builds\VisualStudio2017\Win32\Release_Win32\Standalone Plugin\Ctrlr-Win32.exe"
+		File			"..\..\Builds\VisualStudio2019\Win32\Release_Win32\Standalone Plugin\Ctrlr-Win32.exe"
 		WriteUninstaller	"$INSTDIR\Uninstall.exe"
 		Call RegisterApplication
 	SectionEnd
 
 	Section "64bit binary" SEC2
 		SetOutPath 	"$INSTDIR"
-		File			"..\..\Builds\VisualStudio2017\x64\Release\Standalone Plugin\Ctrlr-x64.exe"
+		File			"..\..\Builds\VisualStudio2019\x64\Release\Standalone Plugin\Ctrlr-x64.exe"
 		WriteUninstaller	"$INSTDIR\Uninstall.exe"
 		Call RegisterApplication
 	SectionEnd
@@ -137,12 +137,12 @@ SectionGroup /e "VST" PROG2
 
 	Section "Executables Win32" SEC5
 		SetOutPath 	"$INSTDIR"
-		File			"..\..\Builds\VisualStudio2017\Win32\Release_Win32\VST\Ctrlr-Win32.dll"
+		File			"..\..\Builds\VisualStudio2019\Win32\Release_Win32\VST\Ctrlr-Win32.dll"
 	SectionEnd
 
 	Section "Executables x64" SEC6
 		SetOutPath 	"$INSTDIR"
-		File			"..\..\Builds\VisualStudio2017\x64\Release\VST\Ctrlr-x64.dll"
+		File			"..\..\Builds\VisualStudio2019\x64\Release\VST\Ctrlr-x64.dll"
 	SectionEnd
 
 SectionGroupEnd
@@ -151,12 +151,12 @@ SectionGroup /e "VST3" PROG3
 
 	Section "Executables Win32" SEC7
 		SetOutPath 	"$INSTDIR"
-		File			"..\..\Builds\VisualStudio2017\Win32\Release_Win32\VST3\Ctrlr-Win32.vst3"
+		File			"..\..\Builds\VisualStudio2019\Win32\Release_Win32\VST3\Ctrlr-Win32.vst3"
 	SectionEnd
 
 	Section "Executables x64" SEC8
 		SetOutPath 	"$INSTDIR"
-		File			"..\..\Builds\VisualStudio2017\x64\Release\VST3\Ctrlr-x64.vst3"
+		File			"..\..\Builds\VisualStudio2019\x64\Release\VST3\Ctrlr-x64.vst3"
 	SectionEnd
 
 SectionGroupEnd

diff --git a/Scripts/post-commit b/Scripts/post-commit
@@ -51,10 +51,10 @@ function detect_os {
 		BUILD_LOG_WIN64=$CTRLR_ROOT/Builds/Ctrlr-$VERSION.win64.build.log
 		CTRLR_KEY="$CTRLR_ROOT/Packaging/ctrlr.key"
 		if [ -d /cygdrive ]; then
-			MSBUILD="/cygdrive/c/Program Files (x86)/Microsoft Visual Studio/2017/Community/MSBuild/15.0/Bin/MSBuild.exe"
+			MSBUILD="/cygdrive/c/Program Files (x86)/Microsoft Visual Studio/2019/Community/MSBuild/Current/Bin/MSBuild.exe"
 			NSIS="/cygdrive/c/Program\ Files\ \(x86\)/NSIS/makensis.exe"
 		else
-			MSBUILD="/c/Program Files (x86)/Microsoft Visual Studio/2017/Community/MSBuild/15.0/Bin/MSBuild.exe"
+			MSBUILD="/c/Program Files (x86)/Microsoft Visual Studio/2019/Community/MSBuild/Current/Bin/MSBuild.exe"
 			NSIS="/c/Program\ Files\ \(x86\)/NSIS/makensis.exe"
 		fi
 		return
@@ -127,7 +127,7 @@ function windows_msbuild {
 	if [ -e "$MSBUILD" ]; then
 		echo "CTRLR: $MSBUILD found"
 
-		cd $CTRLR_ROOT/Builds/VisualStudio2017
+		cd $CTRLR_ROOT/Builds/VisualStudio2019
 
 		echo "CTRLR: Build Win32"
 		"$MSBUILD" Ctrlr.sln /target:Rebuild /fileloggerparameters:logfile=Ctrlr-$VERSION.win32.build.log /property:Configuration=Release_Win32 /property:VisualStudioVersion=15.0 

diff --git a/Source/Core/CtrlrRevision.h b/Source/Core/CtrlrRevision.h
@@ -1,7 +1,7 @@
-#ifndef __CTRLR_REVISION__
-#define __CTRLR_REVISION__
-
-static const char *ctrlrRevision              	= "5.5.9";
-static const char *ctrlrRevisionDate        	= "wto, 5 sty 2021, 14:53:14 CET";
-
-#endif
+#ifndef __CTRLR_REVISION__
+#define __CTRLR_REVISION__
+
+static const char *ctrlrRevision              	= "5.6.0";
+static const char *ctrlrRevisionDate        	= "Wed, Jan 27, 2021  3:40:04 PM";
+
+#endif