diff options
| author | sagitario <sagitario@fc51e93f-b9fe-4711-8d8d-3ae870c5f7d8> | 2013-05-25 17:40:23 (GMT) |
|---|---|---|
| committer | sagitario <sagitario@fc51e93f-b9fe-4711-8d8d-3ae870c5f7d8> | 2013-05-25 17:40:23 (GMT) |
| commit | 0fb1fd5b60c996ed16affcefd37603fb620f107e (patch) | |
| tree | 66c3c2824a9a8bf6c4096203d5b6a80dc1e7f4d4 /src/mspdb.cpp | |
| parent | dd2882c90682885dea946a6e527645b4b237da99 (diff) | |
| download | cv2pdb-0fb1fd5b60c996ed16affcefd37603fb620f107e.zip cv2pdb-0fb1fd5b60c996ed16affcefd37603fb620f107e.tar.gz cv2pdb-0fb1fd5b60c996ed16affcefd37603fb620f107e.tar.bz2 | |
2012-11-09 Version 0.26
* new option -p allows to specify the embedded PDB reference in the binary
* added support for VS2012
2013-05-11 Version 0.27
* fixed crash when converting DWARF locations using 8 bytes or more
Diffstat (limited to 'src/mspdb.cpp')
| -rw-r--r-- | src/mspdb.cpp | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/src/mspdb.cpp b/src/mspdb.cpp index 3602ccd..fc1cdec 100644 --- a/src/mspdb.cpp +++ b/src/mspdb.cpp @@ -16,6 +16,7 @@ mspdb::fnPDBOpen2W *pPDBOpen2W; char* mspdb80_dll = "mspdb80.dll";
char* mspdb100_dll = "mspdb100.dll";
char* mspdb110_dll = "mspdb110.dll";
+// char* mspdb110shell_dll = "mspdbst.dll"; // the VS 2012 Shell uses this file instead of mspdb110.dll, but is missing mspdbsrv.exe
int mspdb::vsVersion = 8;
@@ -47,12 +48,11 @@ bool tryLoadMsPdb(const char* version, const char* mspdb) return modMsPdb != 0;
}
-bool initMsPdb()
+void tryLoadMsPdb80()
{
if (!modMsPdb)
modMsPdb = LoadLibraryA(mspdb80_dll);
-#if 1
if (!modMsPdb)
tryLoadMsPdb("VisualStudio\\9.0", mspdb80_dll);
if (!modMsPdb)
@@ -61,9 +61,10 @@ bool initMsPdb() tryLoadMsPdb("VCExpress\\9.0", mspdb80_dll);
if (!modMsPdb)
tryLoadMsPdb("VCExpress\\8.0", mspdb80_dll);
-#endif
+}
-#if 1
+void tryLoadMsPdb100()
+{
if (!modMsPdb)
{
modMsPdb = LoadLibraryA(mspdb100_dll);
@@ -74,21 +75,40 @@ bool initMsPdb() if (modMsPdb)
mspdb::vsVersion = 10;
}
-#endif
+}
-#if 1
+void tryLoadMsPdb110()
+{
if (!modMsPdb)
{
modMsPdb = LoadLibraryA(mspdb110_dll);
if (!modMsPdb)
tryLoadMsPdb("VisualStudio\\11.0", mspdb110_dll);
if (!modMsPdb)
- tryLoadMsPdb("VCExpress\\11.0", mspdb110_dll);
+ tryLoadMsPdb("VSWinExpress\\11.0", mspdb110_dll);
if (modMsPdb)
mspdb::vsVersion = 11;
}
+}
+
+bool initMsPdb()
+{
+#if 0 // might cause problems when combining VS Shell 2010 with VS 2008 or similar
+ if(const char* p = getenv("VisualStudioDir"))
+ {
+ // guess from environment variable from which version of VS we are invoked and prefer a correspondig mspdb DLL
+ if (strstr(p, "2010"))
+ tryLoadMsPdb100();
+ if (strstr(p, "2012"))
+ tryLoadMsPdb110();
+ // VS2008 tried next anyway
+ }
#endif
+ tryLoadMsPdb80();
+ tryLoadMsPdb100();
+ tryLoadMsPdb110();
+
if (!modMsPdb)
return false;
|