diff options
| author | Michael Hutchinson <mhutchinson@novell.com> | 2010-11-10 22:09:05 +0300 |
|---|---|---|
| committer | Michael Hutchinson <mhutchinson@novell.com> | 2010-11-10 22:09:05 +0300 |
| commit | e78da4e698d5d3f0695b1cc0cb92de89e4777581 (patch) | |
| tree | 87c4ca6b35563fb0700eeb1668ced9d0d39aa07e | |
| parent | 25d8fff975f39cd61bc74bca6c08a1658c1f37ff (diff) | |
[Mac] Use the symlink hack
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | main/build/MacOSX/Makefile.am | 9 | ||||
| -rw-r--r-- | main/build/MacOSX/monostub.c | 25 |
3 files changed, 3 insertions, 32 deletions
diff --git a/.gitignore b/.gitignore index dc3b5488d9..34f60acfc9 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,6 @@ obj/ /main/tests/tmp /main/tests/config /main/tests/UnitTests/test-results -/main/build/MacOSX/monostub # globs Makefile.in diff --git a/main/build/MacOSX/Makefile.am b/main/build/MacOSX/Makefile.am index f49ccc4d69..21ec490d37 100644 --- a/main/build/MacOSX/Makefile.am +++ b/main/build/MacOSX/Makefile.am @@ -20,7 +20,7 @@ clean-local: rm -f MonoDevelop.dmg rm -f MonoDevelop.app.zip -MonoDevelop.app: monostub +MonoDevelop.app: mkdir -p $(MAC_APP_DIR)/Contents/{MacOS,Resources} mkdir -p $(MAC_APP_DIR)/Contents/MacOS/{lib,share} mkdir -p $(MAC_APP_LIB_DIR) @@ -78,8 +78,8 @@ MonoDevelop.app: monostub # Mono stubs to make the process name and bundle location correct mkdir -p "$(MACOS)/bin" - cp monostub "$(MACOS)/bin/monodevelop" - cp monostub "$(MACOS)/bin/mdtool" + ln -s /Library/Frameworks/Mono.framework/Versions/Current/bin/mono "$(MACOS)/bin/monodevelop" + ln -s /Library/Frameworks/Mono.framework/Versions/Current/bin/mono "$(MACOS)/bin/mdtool" # update revision in updateinfo echo "a3140c14-ef90-4019-ae6c-9d93804d6611 $$(cat release-info)" > "$(MACOS)/updateinfo" @@ -97,7 +97,4 @@ MonoDevelop.app: monostub MonoDevelop.app.zip: MonoDevelop.app zip -r9uq MonoDevelop.app.zip MonoDevelop.app -monostub: monostub.c - gcc -m32 monostub.c -o monostub -framework CoreFoundation - .PHONY: MonoDevelop.app diff --git a/main/build/MacOSX/monostub.c b/main/build/MacOSX/monostub.c deleted file mode 100644 index 38d4f73dc3..0000000000 --- a/main/build/MacOSX/monostub.c +++ /dev/null @@ -1,25 +0,0 @@ -#include <stdlib.h> -#include <stdio.h> -#include <dlfcn.h> - -typedef int (*MonoMain) (int argc, char* argv[]); - -int main (int argc, char *argv[]) -{ - void *libmono = dlopen ("libmono-2.0.dylib", RTLD_LAZY); - if (libmono == NULL) { - libmono = dlopen ("libmono-0.dylib", RTLD_LAZY); - if(libmono == NULL) { - printf ("Could not load libmono\n"); - exit (1); - } - } - - MonoMain mono_main = (MonoMain) dlsym (libmono, "mono_main"); - if (mono_main == NULL) { - printf ("Could not load mono_main\n"); - exit (2); - } - - return mono_main (argc, argv); -} |