diff --git a/Build/Build.bat b/Build/Build.bat index 0ff4dbdd..3f10aff6 100644 --- a/Build/Build.bat +++ b/Build/Build.bat @@ -9,7 +9,7 @@ set GIT=%PROGRAMFILES%\Git\bin\git.exe set VERSION_MAJOR=3 set VERSION_MINOR=0 set VERSION_SUBMINOR=1 -set VERSION_REVISION=0 +set VERSION_REVISION=2130 set ISBETA=true set VERSION_FULL=%VERSION_MAJOR%.%VERSION_MINOR%.%VERSION_SUBMINOR%.%VERSION_REVISION% @@ -85,15 +85,6 @@ for /F "tokens=1-4 delims=:.," %%a in ("%TIME%") do ( set /A "BUILD_BEGIN_TIMESTAMP=(((%%a * 60) + 1%%b %% 100)* 60 + 1%%c %% 100) * 100 + 1%%d %% 100" ) -:: Build Library -echo * Building 32-bit projects -%MSBUILD% /t:rebuild /p:Configuration=Release;Platform=Win32 /v:q /m ..\Rainmeter.sln > "BuildLog.txt" -if not %ERRORLEVEL% == 0 echo ERROR %ERRORLEVEL%: Build failed & goto END - -echo * Building 64-bit projects -%MSBUILD% /t:rebuild /p:Configuration=Release;Platform=x64 /v:q /m ..\Rainmeter.sln > "BuildLog.txt" -if not %ERRORLEVEL% == 0 echo ERROR %ERRORLEVEL%: Build failed & goto END - :BUILDLANGUAGES echo * Building languages diff --git a/Build/Installer/Installer.nsi b/Build/Installer/Installer.nsi index 2ac295a3..c200321a 100644 --- a/Build/Installer/Installer.nsi +++ b/Build/Installer/Installer.nsi @@ -505,7 +505,7 @@ UAC_TryAgain: ${EndIf} FunctionEnd -!macro InstallFiles DIR +!macro InstallFiles DIR ARCH SetOutPath "$INSTDIR" File "..\..\TestBench\${DIR}\Release\Rainmeter.exe" File "..\..\TestBench\${DIR}\Release\Rainmeter.dll" @@ -515,8 +515,8 @@ FunctionEnd File /x *Example*.dll "..\..\TestBench\${DIR}\Release\Plugins\*.dll" SetOutPath "$INSTDIR\Runtime" - File "..\Runtime\${DIR}\msvcp110.dll" - File "..\Runtime\${DIR}\msvcr110.dll" + File "$%VS110COMNTOOLS%..\..\VC\redist\${ARCH}\Microsoft.VC110.CRT\msvcp110.dll" + File "$%VS110COMNTOOLS%..\..\VC\redist\${ARCH}\Microsoft.VC110.CRT\msvcr110.dll" !macroend !macro RemoveStartMenuShortcuts STARTMENUPATH @@ -662,9 +662,9 @@ SkipIniMove: File "..\..\Application\Rainmeter.exe.config" ${If} $instArc == "x86" - !insertmacro InstallFiles "x32" + !insertmacro InstallFiles "x32" "x86" ${Else} - !insertmacro InstallFiles "x64" + !insertmacro InstallFiles "x64" "x64" ${EndIf} RMDir /r "$INSTDIR\Languages" diff --git a/Docs/Building.md b/Docs/Building.md index a9281035..83e9eb65 100644 --- a/Docs/Building.md +++ b/Docs/Building.md @@ -11,14 +11,7 @@ After Visual Studio has been installed and updated, open Rainmeter.sln to build. ### Building the installer -To build the full Rainmeter installer, you need to get obtain 32-bit and 64-bit versions of the Visual C++ 2012 Update 3 redistributable DLLs and place them in: - -* `Build\Runtime\x32\msvcr110.dll` -* `Build\Runtime\x32\msvcp110.dll` -* `Build\Runtime\x64\msvcr110.dll` -* `Build\Runtime\x64\msvcp110.dll` - -Then run Build.bat. If you receive "not found" errors, open Build.bat and change the `set=` lines at the top to match your system. +To build the full Rainmeter installer, run Build.bat. If you receive "not found" errors, open Build.bat and change the `set=` lines at the top to match your system. To sign the installer and the Rainmeter executables, create a Certificate.bat file alongside Build.bat with the following contents: