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

Upgrade to Visual Studio 2013

Browse Source
This commit is contained in:
jsmorley
2013-11-29 11:42:12 -05:00
parent d804b4a5c1
commit 9fc4aaad1f
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Build/Build.bat
View File

@@ -1,7 +1,7 @@
@echo off @echo off
setlocal EnableDelayedExpansion setlocal EnableDelayedExpansion
set VCVARSALL=%VS110COMNTOOLS%..\..\VC\vcvarsall.bat set VCVARSALL=%VS120COMNTOOLS%..\..\VC\vcvarsall.bat
set MAKENSIS=%PROGRAMFILES%\NSIS\MakeNSIS.exe set MAKENSIS=%PROGRAMFILES%\NSIS\MakeNSIS.exe
set GIT=%PROGRAMFILES%\Git\bin\git.exe set GIT=%PROGRAMFILES%\Git\bin\git.exe
@@ -22,7 +22,7 @@ if not exist "%VCVARSALL%" echo ERROR: vcvarsall.bat not found & goto END
call "%VCVARSALL%" x86 > nul call "%VCVARSALL%" x86 > nul
set MSBUILD="msbuild.exe" /nologo^ set MSBUILD="msbuild.exe" /nologo^
/p:PlatformToolset=v110_xp;VisualStudioVersion=11.0^ /p:PlatformToolset=v120_xp;VisualStudioVersion=12.0^
/p:ExcludeTests=true^ /p:ExcludeTests=true^
/p:Configuration=Release /p:Configuration=Release

4
Build/Installer/Installer.nsi
View File

@@ -516,8 +516,8 @@ FunctionEnd
File /x *Example*.dll "..\..\${DIR}-Release\Plugins\*.dll" File /x *Example*.dll "..\..\${DIR}-Release\Plugins\*.dll"
SetOutPath "$INSTDIR\Runtime" SetOutPath "$INSTDIR\Runtime"
File "$%VS110COMNTOOLS%..\..\VC\redist\${ARCH}\Microsoft.VC110.CRT\msvcp110.dll" File "$%VS110COMNTOOLS%..\..\VC\redist\${ARCH}\Microsoft.VC120.CRT\msvcp120.dll"
File "$%VS110COMNTOOLS%..\..\VC\redist\${ARCH}\Microsoft.VC110.CRT\msvcr110.dll" File "$%VS110COMNTOOLS%..\..\VC\redist\${ARCH}\Microsoft.VC120.CRT\msvcr120.dll"
!macroend !macroend
!macro RemoveStartMenuShortcuts STARTMENUPATH !macro RemoveStartMenuShortcuts STARTMENUPATH

2
Build/VS/Rainmeter.Cpp.Default.props
View File

@@ -26,6 +26,6 @@
<PropertyGroup Label="Configuration"> <PropertyGroup Label="Configuration">
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v110_xp</PlatformToolset> <PlatformToolset>v120_xp</PlatformToolset>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

3
Build/VS/Rainmeter.Cpp.props
View File

@@ -2,7 +2,7 @@
<!-- Visual C++ project options meant to applied after the default Microsoft property sheets. --> <!-- Visual C++ project options meant to applied after the default Microsoft property sheets. -->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<!-- Use the Win8 SDK headers even though we are using the v110_xp toolset. --> <!-- Use the Win8 SDK headers even though we are using the v120_xp toolset. -->
<IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);</IncludePath> <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);</IncludePath>
</PropertyGroup> </PropertyGroup>
@@ -58,6 +58,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
<RuntimeTypeInfo>false</RuntimeTypeInfo> <RuntimeTypeInfo>false</RuntimeTypeInfo>