Improved batch file

shauleiz · Nov 12, 2015 · 9eacaf4 · 9eacaf4
1 parent 6d21710
commit 9eacaf4
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/BuildAll.bat b/BuildAll.bat
@@ -1,23 +1,42 @@
 echo off
-SET VS=14.0
-SET BUILDER=%ProgramFiles(x86)%\MSBuild\%VS%\Bin\MSBuild.exe
+SET VS_DRV=14.0
+SET VS_APP=14.0
+SET BUILDER_DRV=%ProgramFiles(x86)%\MSBuild\%VS_DRV%\Bin\MSBuild.exe
+SET BUILDER_APP=%ProgramFiles(x86)%\MSBuild\%VS_APP%\Bin\MSBuild.exe
 SET Target64=x64\Release
 SET Target32=Win32\Release
 SET DigiCertUtil=%USERPROFILE%\DESKTOP\DigiCertUtil.exe
 SET InnoCompiler=%ProgramFiles(x86)%\Inno Setup 5\ISCC.exe
 
 
 :build32
-echo Building vJoy (x86)
-"%BUILDER%"  vjoy.sln  /t:rebuild /p:Platform=Win32;Configuration=Release
+echo Building vJoy (x86) Driver
+"%BUILDER_DRV%"  vjoy.sln  /t:rebuild /p:Platform=Win32;Configuration=Release
 set BUILD_STATUS=%ERRORLEVEL%
 if not %BUILD_STATUS%==0 goto fail
+echo Building vJoy (x86) Driver [End]
+
+:build32_App
+echo Building vJoy (x86) Apps
+"%BUILDER_APP%"  vjoyapps.sln  /t:rebuild /p:Platform=Win32;Configuration=Release
+set BUILD_STATUS=%ERRORLEVEL%
+if not %BUILD_STATUS%==0 goto fail
+echo Building vJoy (x86) Apps [End]
+
 
 :build64
-echo Building vJoy (x64)
-"%BUILDER%"  vjoy.sln  /t:rebuild /p:Platform=x64;Configuration=Release
+echo Building vJoy (x64) Driver
+"%BUILDER_DRV%"  vjoy.sln  /t:rebuild /p:Platform=x64;Configuration=Release
+set BUILD_STATUS=%ERRORLEVEL%
+if not %BUILD_STATUS%==0 goto fail
+echo Building vJoy (x64) Driver [End]
+
+:build64_App
+echo Building vJoy (x64) Apps
+"%BUILDER_APP%"  vjoyapps.sln  /t:rebuild /p:Platform=x64;Configuration=Release
 set BUILD_STATUS=%ERRORLEVEL%
 if not %BUILD_STATUS%==0 goto fail
+echo Building vJoy (x64) Apps [End]
 
 :signapps
 echo Signing the applications

diff --git a/vJoyApps.sln b/vJoyApps.sln
@@ -32,6 +32,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vJoyInstall", "apps\vJoyIns
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vJoyConf", "apps\vJoyConf\vJoyConf2013.vcxproj", "{B9A43168-309F-45A0-AC09-014787390F02}"
 	ProjectSection(ProjectDependencies) = postProject
+		{4ADC2F16-F17A-414E-A990-726D7A2F15A6} = {4ADC2F16-F17A-414E-A990-726D7A2F15A6}
 		{B417FA41-8239-41EC-B899-145A9D65903E} = {B417FA41-8239-41EC-B899-145A9D65903E}
 		{8971D7E3-7880-4660-9DEE-A0C59A54B347} = {8971D7E3-7880-4660-9DEE-A0C59A54B347}
 	EndProjectSection
@@ -40,6 +41,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vJoyInterface", "apps\commo
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vJoyConfig", "apps\vJoyConf\vJoyConfig\vJoyConfig2013.vcxproj", "{F10FA399-54DF-434C-B438-DD06B3159CE8}"
 	ProjectSection(ProjectDependencies) = postProject
+		{4ADC2F16-F17A-414E-A990-726D7A2F15A6} = {4ADC2F16-F17A-414E-A990-726D7A2F15A6}
 		{B417FA41-8239-41EC-B899-145A9D65903E} = {B417FA41-8239-41EC-B899-145A9D65903E}
 		{8971D7E3-7880-4660-9DEE-A0C59A54B347} = {8971D7E3-7880-4660-9DEE-A0C59A54B347}
 	EndProjectSection