diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2012-02-20 16:58:33 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2012-02-20 16:58:33 +0400 |
| commit | 06fda9a5a59a241aec24b6703aadd7bae49cd939 (patch) | |
| tree | af24300e5d97d01770c88b130ac77124ce1563ad /extras/MonoDevelop.MonoMac | |
| parent | 4fa94e7189cd0540e295c9992e9fcd7e8457a319 (diff) | |
| parent | 1f68e48d789fd3b86d8879f91b599a8aa144dcfd (diff) | |
Merge branch 'master' into newresolver
Conflicts:
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/GtkAlertDialog.cs
Diffstat (limited to 'extras/MonoDevelop.MonoMac')
| -rwxr-xr-x | extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMac.dll | bin | 4522496 -> 4601856 bytes | |||
| -rw-r--r-- | extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMac.dll.mdb | bin | 1452486 -> 1491838 bytes | |||
| -rw-r--r-- | extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacBuildExtension.cs | 3 |
3 files changed, 2 insertions, 1 deletions
diff --git a/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMac.dll b/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMac.dll Binary files differindex 4be0ac4e78..d845e06167 100755 --- a/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMac.dll +++ b/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMac.dll diff --git a/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMac.dll.mdb b/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMac.dll.mdb Binary files differindex 8a67860d96..b1fad54ad6 100644 --- a/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMac.dll.mdb +++ b/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMac.dll.mdb diff --git a/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacBuildExtension.cs b/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacBuildExtension.cs index 963d744e6a..65fde0d050 100644 --- a/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacBuildExtension.cs +++ b/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacBuildExtension.cs @@ -263,7 +263,8 @@ namespace MonoDevelop.MonoMac args.AddQuoted (file.Input); args.Add ("--compile"); args.AddQuoted (file.Output); - var psi = new ProcessStartInfo ("ibtool", args.ToString ()); + var ibtoolPath = AppleSdkSettings.DeveloperRoot.Combine ("usr", "bin", "ibtool"); + var psi = new ProcessStartInfo (ibtoolPath, args.ToString ()); monitor.Log.WriteLine (psi.FileName + " " + psi.Arguments); int code; try { |