diff options
| -rw-r--r-- | Config.exe | bin | 16896 -> 16896 bytes | |||
| -rw-r--r-- | docs/WIN32.txt | 7 | ||||
| -rw-r--r-- | src/win32/Config.cs | 11 |
3 files changed, 11 insertions, 7 deletions
diff --git a/Config.exe b/Config.exe Binary files differindex 61a2650e3..38c92a4bc 100644 --- a/Config.exe +++ b/Config.exe diff --git a/docs/WIN32.txt b/docs/WIN32.txt index 17b4e38ab..769c397d4 100644 --- a/docs/WIN32.txt +++ b/docs/WIN32.txt @@ -25,12 +25,11 @@ Anope for Windows (NOTE: When installing, tell CMake to add itself to the PATH.)
- If you have Visual C++ 10 (2010) skip ahead to step 2, else you
- need to download the following free component from Microsoft. Once
- downloaded, install these packages.
+ If you have Visual C++ 10 or 11 (2010/2012) skip ahead to step 2, else you
+ need to download and install the following free component from Microsoft.
* Microsoft Visual C++ 2010 Express Edition:
- http://www.microsoft.com/express/vc/
+ http://www.microsoft.com/visualstudio/eng/downloads#d-2010-express
2) Unpack the Anope tarball with your favorite uncompression program
(WinZip or WinRAR, etc).
diff --git a/src/win32/Config.cs b/src/win32/Config.cs index 5b0b0af91..0200b80b6 100644 --- a/src/win32/Config.cs +++ b/src/win32/Config.cs @@ -204,7 +204,7 @@ namespace Config Dictionary<int, string> InstallerQuestions = new Dictionary<int, string>();
InstallerQuestions.Add(0, "Where do you want Anope to be installed?");
InstallerQuestions.Add(1, "Would you like to build using NMake instead of using Visual Studio?\r\nNOTE: If you decide to use NMake, you must be in an environment where\r\nNMake can function, such as the Visual Studio command line. If you say\r\nyes to this while not in an environment that can run NMake, it can\r\ncause the CMake configuration to enter an endless loop. [y/n]");
- InstallerQuestions.Add(2, "Are you using Visual Studio 2008 or 2010? You can leave this blank\nand have CMake try and auto detect it, but this usually doesn't\nwork correctly. [2008/2010]");
+ InstallerQuestions.Add(2, "Are you using Visual Studio 2008, 2010, or 2012? You can leave this blank\nand have CMake try and auto detect it, but this usually doesn't\nwork correctly. [2008/2010/2012]");
InstallerQuestions.Add(3, "Would you like to build a debug version of Anope? [y/n]");
InstallerQuestions.Add(4, "Are there any extra arguments you wish to pass to cmake?\nYou may only need to do this if cmake is unable to locate missing dependencies without hints.\nTo do this, set the variable EXTRA_INCLUDE like this: -DEXTRA_INCLUDE:STRING=c:/some/path/include;c:/some/path/bin;c:/some/path/lib");
@@ -260,7 +260,12 @@ namespace Config ++i;
break;
case 2:
- if (InstallerResponse == "2010")
+ if (InstallerResponse == "2012")
+ {
+ VSVersion = "-G\"Visual Studio 11\" ";
+ VSShortVer = "2012";
+ }
+ else if (InstallerResponse == "2010")
{
VSVersion = "-G\"Visual Studio 10\" ";
VSShortVer = "2010";
@@ -304,7 +309,7 @@ namespace Config InstallDirectory = "-DINSTDIR:STRING=\"" + InstallDirectory.Replace('\\', '/') + "\" ";
string NMake = UseNMake ? "-G\"NMake Makefiles\" " : "";
string Debug = BuildDebug ? "-DCMAKE_BUILD_TYPE:STRING=DEBUG " : "-DCMAKE_BUILD_TYPE:STRING=RELEASE ";
- string cMake = InstallDirectory + NMake + Debug + VSVersion + ExtraArguments + Environment.CurrentDirectory.Replace('\\','/');
+ string cMake = InstallDirectory + NMake + Debug + VSVersion + ExtraArguments + "\"" + Environment.CurrentDirectory.Replace('\\','/') + "\"";
RunCMake(cMake);
return 0;
|