diff options
| author | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-09-18 03:55:23 +0300 |
|---|---|---|
| committer | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-09-18 12:09:33 +0300 |
| commit | 3cfa7b0a265e72e88f75c16c070441ccce3bddc0 (patch) | |
| tree | 20f349a6d5cc15138849d6eb264228e9b17dc8a8 /main | |
| parent | 461919d442ad4c7634a10b46a69c29250040cfb7 (diff) | |
[Mac] Build and use monostub by default.
Diffstat (limited to 'main')
| -rw-r--r-- | main/Makefile.am | 7 | ||||
| -rw-r--r-- | main/build/MacOSX/Makefile.am | 2 | ||||
| -rw-r--r-- | main/build/MacOSX/monostub.m | 2 | ||||
| -rw-r--r-- | main/build/Makefile.am | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/main/Makefile.am b/main/Makefile.am index 4f8c22d2a5..195f502fba 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -108,7 +108,14 @@ apidocs: MD_LAUNCH=$(MD_LAUNCH_SETUP) $(MD_LAUNCH_EXTRA_ENV) UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 exec -a "monodevelop" $(RUNTIME) +if ENABLE_MACPLATFORM +run: run-bundle +else run: run-sgen +endif + +run-bundle: $(PROGRAM) + $(MD_LAUNCH_SETUP) $(MD_LAUNCH_EXTRA_ENV) $(MD_BIN_PATH)/MonoDevelop --no-redirect run-boehm: runmd diff --git a/main/build/MacOSX/Makefile.am b/main/build/MacOSX/Makefile.am index dad4f2e927..0b8798de16 100644 --- a/main/build/MacOSX/Makefile.am +++ b/main/build/MacOSX/Makefile.am @@ -33,6 +33,7 @@ clean-local: rm -f MonoDevelop*.dmg app: monostub +if ENABLE_MACBUNDLE @echo "" @echo "Creating directories in app bundle" @echo "" @@ -141,5 +142,6 @@ app: monostub @if test -f missing-stuff; then echo ""; echo "Missing stuff:"; cat missing-stuff; fi @echo "" @rm -f missing-stuff +endif .PHONY: app dmg diff --git a/main/build/MacOSX/monostub.m b/main/build/MacOSX/monostub.m index f864043dd7..f46268b970 100644 --- a/main/build/MacOSX/monostub.m +++ b/main/build/MacOSX/monostub.m @@ -383,7 +383,7 @@ int main (int argc, char **argv) NSString *binDir = [[NSString alloc] initWithUTF8String: "Contents/Resources/lib/monodevelop/bin"]; BOOL isDir = NO; if (![[NSFileManager defaultManager] fileExistsAtPath: binDir isDirectory: &isDir] || !isDir) - binDir = @"."; + binDir = [[NSString alloc] initWithUTF8String: "."]; NSString *appDir = [[NSBundle mainBundle] bundlePath]; // can be overridden with plist string MonoMinVersion diff --git a/main/build/Makefile.am b/main/build/Makefile.am index 9217be1a33..b8863d3775 100644 --- a/main/build/Makefile.am +++ b/main/build/Makefile.am @@ -1,5 +1,5 @@ -if ENABLE_MACBUNDLE +if ENABLE_MACPLATFORM SUBDIRS = MacOSX else |