diff options
| -rwxr-xr-x | configure | 13 | ||||
| -rw-r--r-- | main/Makefile.am | 13 | ||||
| -rw-r--r-- | main/configure.in | 18 | ||||
| -rw-r--r-- | main/external/Makefile.am | 2 |
4 files changed, 32 insertions, 14 deletions
@@ -52,6 +52,8 @@ usage () echo "" echo "--enable-release" echo " Builds md in release mode" + echo "--enable-mac64" + echo " Build for x64 on OS X" echo "" echo "--profile=PROFILE" echo "" @@ -159,6 +161,12 @@ configure_packages () enable_tests=" " fi + if test xyes == x$x64; then + enable_x64=--with-macarch=x86_64 + else + enable_x64=--with-macarch=i386 + fi + prefixarg="--prefix=$prefix" builddir=`pwd`/$path/build @@ -182,7 +190,7 @@ configure_packages () echo echo "Configuration options: $ops" if test -a $path/autogen.sh; then - sct="./autogen.sh $enable_tests" + sct="./autogen.sh $enable_tests $enable_x64" elif test -a $path/configure; then sct=./configure elif test -a $path/configure.sh; then @@ -235,6 +243,9 @@ while test x$1 != x; do --enable-release) release=yes ;; + --enable-mac64) + x64=yes + ;; --prefix=*) prefix=`echo $1 | sed 's/--prefix=//'` ;; diff --git a/main/Makefile.am b/main/Makefile.am index 7a165c5dcc..85ddb398af 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -122,28 +122,19 @@ run-64: run-sgen-64 run-boehm: runmd run-sgen: runmd-sgen -run-sgen-64: runmd-sgen-64 runmd: $(PROGRAM) $(MD_LAUNCH) --debug $(MD_BIN_PATH)/MonoDevelop.exe --no-redirect runmd-sgen: $(PROGRAM) - $(MD_LAUNCH)-sgen --debug $(MD_BIN_PATH)/MonoDevelop.exe --no-redirect - -runmd-sgen-64: $(PROGRAM) - $(MD_LAUNCH)-sgen64 --debug $(MD_BIN_PATH)/MonoDevelop.exe --no-redirect + $(MD_LAUNCH)-sgen@SGEN_SUFFIX@ --debug $(MD_BIN_PATH)/MonoDevelop.exe --no-redirect run-debug: $(PROGRAM) MONODEVELOP_CONSOLE_LOG_LEVEL=All $(MD_LAUNCH) --debug=casts $(MD_BIN_PATH)/MonoDevelop.exe --no-redirect run-gdb: $(PROGRAM) echo "run --debug $(MD_BIN_PATH)/MonoDevelop.exe" > gdb.commands - $(MD_LAUNCH_SETUP) gdb $(RUNTIME) -x gdb.commands - rm -f gdb.commands - -run-gdb-64: $(PROGRAM) - echo "run --debug $(MD_BIN_PATH)/MonoDevelop.exe" > gdb.commands - $(MD_LAUNCH_SETUP) gdb $(RUNTIME)-64 -x gdb.commands + $(MD_LAUNCH_SETUP) gdb $(RUNTIME)@SGEN_SUFFIX) -x gdb.commands rm -f gdb.commands run-gdb-sgen: $(PROGRAM) diff --git a/main/configure.in b/main/configure.in index d5d1fbaca7..325b29d751 100644 --- a/main/configure.in +++ b/main/configure.in @@ -49,6 +49,7 @@ AC_SUBST(MONO_GAC_PREFIX) default_gnomeplatform=no default_windowsplatform=no default_macplatform=no +default_macarch=i386 case `uname` in Darwin) default_macplatform=yes ;; @@ -215,11 +216,26 @@ AC_ARG_ENABLE(macplatform, enable_macplatform=${enableval}, enable_macplatform=$default_macplatform) if test x$enable_macplatform = xyes; then - platform_bindings="${platform_bindings}Mac " + platform_bindings="${platform_bindings}Mac ${with_macarch}" fi AM_CONDITIONAL(ENABLE_MACPLATFORM, [test x$enable_macplatform = xyes]) +# What architecture for Mac +AC_ARG_WITH(macarch, + AC_HELP_STRING([--with-macarch], + [which architecture for mac: i386, x86_64 [default=i386]]), + with_macarch=${withval}, with_macarch=$default_macarch) + +SGEN_SUFFIX= +if test x$with_macarch = xx86_64; then + SGEN_SUFFIX=64 +fi +AC_SUBST(SGEN_SUFFIX) + +MAC_ARCHITECTURE=${with_macarch} +AC_SUBST(MAC_ARCHITECTURE) + # Windows platform addin AC_ARG_ENABLE(windowsplatform, AC_HELP_STRING([--enable-windowsplatform], diff --git a/main/external/Makefile.am b/main/external/Makefile.am index 9bc7771c80..407f972f56 100644 --- a/main/external/Makefile.am +++ b/main/external/Makefile.am @@ -8,7 +8,7 @@ if ENABLE_MACPLATFORM all: Xamarin.Mac.dll $(MAKE) -C monomac/src -Xamarin.Mac.dll: /Library/Frameworks/Xamarin.Mac.framework/Versions/Current/lib/i386/full/Xamarin.Mac.dll +Xamarin.Mac.dll: /Library/Frameworks/Xamarin.Mac.framework/Versions/Current/lib/@MAC_ARCHITECTURE@/full/Xamarin.Mac.dll cp -p $< $@ cp -p $<.mdb $@.mdb cp -p /Library/Frameworks/Xamarin.Mac.framework/Versions/Current/lib/libxammac.dylib . |