diff options
| author | Michael Hutchinson <mhutchinson@novell.com> | 2010-01-15 23:06:19 +0300 |
|---|---|---|
| committer | Michael Hutchinson <mhutchinson@novell.com> | 2010-01-15 23:06:19 +0300 |
| commit | a9c9b088ad4a443161ee1eca1dcc32f7fd35d6d3 (patch) | |
| tree | 21f978e4dcd35c8ee3676262f7bea9014edf15f9 /main/Main.sln | |
| parent | 8575f09f17cd1a2b4415cc643dc0cb3ccf1f2a55 (diff) | |
* Main.sln:
* contrib/Mono.Cecil/Makefile.am:
* contrib/Mono.Cecil/Mono.Cecil.csproj:
* src/addins/MonoDevelop.AssemblyBrowser/Makefile.am:
* src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj:
* src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.addin.xml:
Fix the Cecil decompiler in the build. Make building MD with
Makefiles work again, and puts the decompiler properly in its own
dll instead of merging it into a franken-Cecil.
svn path=/trunk/monodevelop/; revision=149644
Diffstat (limited to 'main/Main.sln')
| -rw-r--r-- | main/Main.sln | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/main/Main.sln b/main/Main.sln index 22b3ea9f17..3a48df0305 100644 --- a/main/Main.sln +++ b/main/Main.sln @@ -164,6 +164,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil.Mdb", "contrib\M EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "contrib\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cecil.Decompiler", "contrib\Mono.Cecil\Cecil.Decompiler.csproj", "{F42917B1-C243-4B2B-AD2B-3B40CD7BCC33}"
+EndProject
Project("{9344bdbb-3e7f-41fc-a0dd-8665d75ee146}") = "po", "po\po.mdproj", "{AC7D119C-980B-4712-8811-5368C14412D7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{5D3F7E65-E55B-45CA-A83B-D1E10040281E}"
@@ -691,6 +693,18 @@ Global {F0F81D55-6265-474F-BE08-CE71818181B5}.DebugWin32|x86.Build.0 = Debug|Any CPU
{F0F81D55-6265-474F-BE08-CE71818181B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F0F81D55-6265-474F-BE08-CE71818181B5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F42917B1-C243-4B2B-AD2B-3B40CD7BCC33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F42917B1-C243-4B2B-AD2B-3B40CD7BCC33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F42917B1-C243-4B2B-AD2B-3B40CD7BCC33}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {F42917B1-C243-4B2B-AD2B-3B40CD7BCC33}.Debug|x86.Build.0 = Debug|Any CPU
+ {F42917B1-C243-4B2B-AD2B-3B40CD7BCC33}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+ {F42917B1-C243-4B2B-AD2B-3B40CD7BCC33}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+ {F42917B1-C243-4B2B-AD2B-3B40CD7BCC33}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+ {F42917B1-C243-4B2B-AD2B-3B40CD7BCC33}.DebugWin32|x86.Build.0 = Debug|Any CPU
+ {F42917B1-C243-4B2B-AD2B-3B40CD7BCC33}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F42917B1-C243-4B2B-AD2B-3B40CD7BCC33}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F42917B1-C243-4B2B-AD2B-3B40CD7BCC33}.Release|x86.ActiveCfg = Release|Any CPU
+ {F42917B1-C243-4B2B-AD2B-3B40CD7BCC33}.Release|x86.Build.0 = Release|Any CPU
{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
@@ -801,6 +815,7 @@ Global {3EC06433-F168-4C5B-A885-99CE4AB617E1} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
{201F7AC0-D2D5-4F51-85A8-17475DADBED3} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
+ {F42917B1-C243-4B2B-AD2B-3B40CD7BCC33} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
{BFE8691A-D323-4622-9021-7B8B27F81599} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}
{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}
{1497D0A8-AFF1-4938-BC22-BE79B358BA5B} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}
|