chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Build: Use Visual Studio's copy of the CRT DLLs

Browse Source
This commit is contained in:
Birunthan Mohanathas
2013-10-19 17:15:41 +03:00
parent 04e3376d5a
commit 13c6b0363e
3 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Build/Build.bat
View File

@@ -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

10
Build/Installer/Installer.nsi
View File

@@ -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"