From cabc5f00a44c06492914222f10def7481a8101da Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Tue, 18 Dec 2012 20:01:19 +0200 Subject: [PATCH] Upgraded project to VS2012 (Update 1) --- Build/Build.bat | 2 +- Build/Instructions.txt | 44 ++++++++++++++++++++---------------------- Rainmeter.props | 1 + Rainmeter.sln | 4 ++-- RainmeterCPP.sln | 5 +++-- RainmeterCS.sln | 4 ++-- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Build/Build.bat b/Build/Build.bat index 22ce0691..3385702b 100644 --- a/Build/Build.bat +++ b/Build/Build.bat @@ -1,7 +1,7 @@ @echo off setlocal EnableDelayedExpansion -set VCVARSALL=%PROGRAMFILES%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat +set VCVARSALL=%PROGRAMFILES%\Microsoft Visual Studio 11.0\VC\vcvarsall.bat set MAKENSIS=%PROGRAMFILES%\NSIS\MakeNSIS.exe set SUBWCREV=%PROGRAMFILES%\TortoiseSVN\bin\SubWCRev.exe set GIT=%PROGRAMFILES%\Git\bin\git.exe diff --git a/Build/Instructions.txt b/Build/Instructions.txt index eea39e82..3c8a31bf 100644 --- a/Build/Instructions.txt +++ b/Build/Instructions.txt @@ -1,35 +1,28 @@ Building -------------------------- -Note: If you already have any paid version of Visual Studio 2010 installed (e.g. Professional, Premium, Ultimate, etc.), simply open Rainmeter.sln to build (and skip the instructions below). +Rainmeter can be built using the free Visual Studio Express 2012 for Windows Desktop +or any paid version of VS2012 (e.g. Professional). -* To build Rainmeter and C++ plugins, install the following tools in the listed order: - 1. Visual C++ 2010 Express Edition - 2. Visual Studio 2010 SP1 (yes, this is for Visual C++ 2010 as well) - 3. Windows 7.1 SDK - 4. KB2519277 compiler update - 5. Open RainmeterCPP.sln to build. +The free VS2012 Express for Windows Desktop is available for download from: + http://microsoft.com/visualstudio/eng/products/visual-studio-express-for-windows-desktop -* To build Rainmeter, C/C++ plugins, and C# plugins, install the following tools in the listed order: - 1. Visual C++ 2010 Express Edition - 2. Visual C# 2010 Express Edition - 3. Visual Studio 2010 SP1 (yes, this is for Visual C++/C# 2010 as well) - 4. Windows 7.1 SDK - 5. KB2519277 compiler update - 6. Open Rainmeter.sln to build. +VS2012 Update 1 is also required for Windows XP targeting support. It is available +from: + http://microsoft.com/visualstudio/eng/downloads#d-visual-studio-2012-update -* To build only C# plugins, install the following tools in the listed order: - 7. Visual C# 2010 Express Edition - 8. Visual Studio 2010 SP1 (yes, this is for Visual C++/C# 2010 as well) - 9. Open RainmeterCS.sln to build. +Once both Visual Studio and Update 1 have been installed, open Rainmeter.sln to build +projects. Building installer -------------------------- -To build the full Rainmeter distribution, run Build.bat. If you receive "not found" errors, open Build.bat and change the variables at the top to match your system. +To build the full Rainmeter distribution, run Build.bat. If you receive "not found" +errors, open Build.bat and change the variables 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: +To sign the installer and the Rainmeter executables, create a Certificate.bat file +alongside Build.bat with the following contents: set CERTFILE=/path/to/PFXcert.p12 set CERTKEY=certpassword @@ -38,10 +31,15 @@ To sign the installer and the Rainmeter executables, create a Certificate.bat fi Building old versions -------------------------- -The Rainmeter GitHub repository does not contain the full source code history required to build the installer for versions prior to r1249. To obtain the full source from r1 to r1248, use the old Google Code SVN repository located at: +The Rainmeter GitHub repository does not contain the full source code history required +to build the installer for versions prior to r1249. To obtain the full source from r1 +to r1248, use the old Google Code SVN repository located at: http://rainmeter.googlecode.com/svn -The build instructions above are applicable to r1130 - r1248. Build instructions for r27 - r1129 can be found in svn/wiki/. +The build instructions above are applicable to r1130 - r1248. Build instructions for +r27 - r1129 can be found in svn/wiki/. -The language files for r963 - r1214 were in a separate repository (svn:externals), which is not available any longer. As a result, the language .dll's for those revisions cannot be built. \ No newline at end of file +The language files for r963 - r1214 were in a separate repository (svn:externals), +which is not available any longer. As a result, the language .dll's for those revisions +cannot be built. \ No newline at end of file diff --git a/Rainmeter.props b/Rainmeter.props index ade0c5df..27b35c8a 100644 --- a/Rainmeter.props +++ b/Rainmeter.props @@ -21,6 +21,7 @@ Unicode + v110_xp true diff --git a/Rainmeter.sln b/Rainmeter.sln index c3f28afd..7fff7777 100644 --- a/Rainmeter.sln +++ b/Rainmeter.sln @@ -1,6 +1,6 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Application", "Application\Application.vcxproj", "{D2A0903C-E760-4134-AE61-3D55BF8F760C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Language", "Language\Language.vcxproj", "{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}" diff --git a/RainmeterCPP.sln b/RainmeterCPP.sln index 1bb0857d..b5d1d8d5 100644 --- a/RainmeterCPP.sln +++ b/RainmeterCPP.sln @@ -1,5 +1,6 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Application", "Application\Application.vcxproj", "{D2A0903C-E760-4134-AE61-3D55BF8F760C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Language", "Language\Language.vcxproj", "{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}" diff --git a/RainmeterCS.sln b/RainmeterCS.sln index 9da04361..10eb26c0 100644 --- a/RainmeterCS.sln +++ b/RainmeterCS.sln @@ -1,6 +1,6 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C# Express 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DllExporter", "Plugins\API\DllExporter\DllExporter.csproj", "{49D56CA5-54AB-45C9-A245-EAE588FCBFE1}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginInputText", "Plugins\PluginInputText\PluginInputText.csproj", "{2CFEC79A-E39E-4FFD-ABC2-C4A69DD1E44D}"