diff --git a/src/CppParser/VSLookup.cpp b/src/CppParser/VSLookup.cpp index 9974fcd6..19c05c1f 100644 --- a/src/CppParser/VSLookup.cpp +++ b/src/CppParser/VSLookup.cpp @@ -197,6 +197,8 @@ static bool getVisualStudioDir(std::string &path) { } // Try the environment. + const char *vs120comntools = getenv("VS120COMNTOOLS"); + const char *vs110comntools = getenv("VS110COMNTOOLS"); const char *vs100comntools = getenv("VS100COMNTOOLS"); const char *vs90comntools = getenv("VS90COMNTOOLS"); const char *vs80comntools = getenv("VS80COMNTOOLS"); @@ -204,7 +206,15 @@ static bool getVisualStudioDir(std::string &path) { // Try to find the version that we were compiled with if(false) {} - #if (_MSC_VER >= 1600) // VC100 + #if (_MSC_VER >= 1800) // VC120 + else if (vs120comntools) { + vscomntools = vs120comntools; + } + #elif (_MSC_VER == 1700) // VC110 + else if (vs110comntools) { + vscomntools = vs110comntools; + } + #elif (_MSC_VER == 1600) // VC100 else if(vs100comntools) { vscomntools = vs100comntools; } @@ -218,6 +228,10 @@ static bool getVisualStudioDir(std::string &path) { } #endif // Otherwise find any version we can + else if (vs120comntools) + vscomntools = vs120comntools; + else if (vs110comntools) + vscomntools = vs110comntools; else if (vs100comntools) vscomntools = vs100comntools; else if (vs90comntools) diff --git a/src/Parser/VSLookup.cpp b/src/Parser/VSLookup.cpp index af7d4ba7..af708562 100644 --- a/src/Parser/VSLookup.cpp +++ b/src/Parser/VSLookup.cpp @@ -228,12 +228,16 @@ static bool getVisualStudioDir(std::string &path) { } #endif // Otherwise find any version we can + else if (vs120comntools) + vscomntools = vs120comntools; + else if (vs110comntools) + vscomntools = vs110comntools; else if (vs100comntools) - vscomntools = vs100comntools; + vscomntools = vs100comntools; else if (vs90comntools) - vscomntools = vs90comntools; + vscomntools = vs90comntools; else if (vs80comntools) - vscomntools = vs80comntools; + vscomntools = vs80comntools; if (vscomntools && *vscomntools) { const char *p = strstr(vscomntools, "\\Common7\\Tools");