Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[mtouch] Look where XS 6.1+ has installed mlaunch. Fixes part of #41083 #51

Merged
merged 2 commits into from
May 16, 2016
Merged

[mtouch] Look where XS 6.1+ has installed mlaunch. Fixes part of #41083 #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
448a3cf
[mtouch] Look where XS 6.1+ has installed mlaunch. Fixes part of #41083
spouliot May 13, 2016
61b3006
[mtouch] Fix --sdkroot not to report a default to /Developer/. Fixes …
spouliot May 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mk/xamarin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ifdef ENABLE_XAMARIN
NEEDED_MACCORE_VERSION := eb9c34d8752ccbc74eafe267232c4c77ba8f631f
NEEDED_MACCORE_VERSION := 16ebbc5b4401ecdd86c60bb0ddbf3234334f63b5
NEEDED_MACCORE_BRANCH := master

MACCORE_DIRECTORY := maccore
Expand Down
4 changes: 2 additions & 2 deletions tools/mtouch/mtouch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1283,7 +1283,7 @@ static int Main2 (string [] args)
{ "unsupported--enable-generics-in-registrar", "[Deprecated]", v => { enable_generic_nsobject = true; classic_only_arguments.Add ("--unsupported--enable-generics-in-registrar"); }, true },
{ "stderr=", "Redirect the standard error for the simulated application to the specified file [DEPRECATED]", v => { }, true },
{ "stdout=", "Redirect the standard output for the simulated application to the specified file [DEPRECATED]", v => { }, true },
{ "sdkroot=", "Specify the location of Apple SDKs, default to: '/Developer/'", v => sdk_root = v },
{ "sdkroot=", "Specify the location of Apple SDKs, default to 'xcode-select' value.", v => sdk_root = v },
{ "crashreporting-api-key=", "Specify the Crashlytics API key to use (which will also enable Crashlytics support). [Deprecated].", v =>
{
throw new MonoTouchException (16, true, "The option '{0}' has been deprecated.", "--crashreporting-api-key");
Expand Down Expand Up @@ -1519,7 +1519,7 @@ static string MlaunchPath {
return path;

// check inside XS
path = "/Applications/Xamarin Studio.app/Contents/MacOS/mlaunch";
path = "/Applications/Xamarin Studio.app/Contents/Resources/lib/monodevelop/AddIns/MonoDevelop.IPhone/mlaunch.app/Contents/MacOS/mlaunch";
if (File.Exists (path))
return path;

Expand Down