Skip to content

Commit

Permalink
Add specific configure option to enable the WatchOS BCL libraries.
Browse files Browse the repository at this point in the history
  • Loading branch information
rolfbjarne committed Aug 13, 2015
1 parent 8058ef2 commit 7693e3d
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 12 deletions.
26 changes: 15 additions & 11 deletions configure.ac
Expand Up @@ -3424,10 +3424,11 @@ case "x$libgc" in
;;
esac

AC_ARG_WITH(profile4_x,[ --with-profile4=yes,no If you want to install the 4.6 FX (defaults to yes)], [], [with_profile4_x=yes])
AC_ARG_WITH(monodroid, [ --with-monodroid=yes,no If you want to build the MonoDroid assemblies (defaults to no)], [], [with_monodroid=no])
AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no If you want to build the Xamarin.iOS assemblies (defaults to no)], [], [with_monotouch=no])
AC_ARG_WITH(xammac, [ --with-xammac=yes,no If you want to build the Xamarin.Mac assemblies (defaults to no)], [], [with_xammac=no])
AC_ARG_WITH(profile4_x, [ --with-profile4=yes,no If you want to install the 4.6 FX (defaults to yes)], [], [with_profile4_x=yes])
AC_ARG_WITH(monodroid, [ --with-monodroid=yes,no If you want to build the MonoDroid assemblies (defaults to no)], [], [with_monodroid=no])
AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no If you want to build the Xamarin.iOS assemblies (defaults to no)], [], [with_monotouch=no])
AC_ARG_WITH(monotouch_watch, [ --with-monotouch_watch=yes,no If you want to build the Xamarin.WatchOS assemblies (defaults to no)],[], [with_monotouch_watch=no])

This comment has been minimized.

Copy link
@knocte

knocte Aug 13, 2015

Contributor

I'm guessing it would be better to be consistent here: either use underscores or dashes, but not both?

This comment has been minimized.

Copy link
@rolfbjarne

rolfbjarne Aug 14, 2015

Author Member

I used underscore because that's the name of the profile (monotouch_watch), and because underscores were used before (--with_profile4_5, for instance).

But I don't care much, both work fine for me.

AC_ARG_WITH(xammac, [ --with-xammac=yes,no If you want to build the Xamarin.Mac assemblies (defaults to no)], [], [with_xammac=no])

OPROFILE=no
AC_ARG_WITH(oprofile,[ --with-oprofile=no,<oprofile install dir> Enable oprofile support (defaults to no)],[
Expand Down Expand Up @@ -3514,6 +3515,7 @@ if test x$cross_compiling = xyes -o x$enable_mcs_build = xno; then
with_profile4_x=no
with_monodroid=no
with_monotouch=no
with_monotouch_watch=no
with_xammac=no
fi

Expand All @@ -3536,6 +3538,7 @@ libmono_ldflags="$libmono_ldflags $LIBS"
AM_CONDITIONAL(INSTALL_4_x, [test "x$with_profile4_x" = xyes])
AM_CONDITIONAL(INSTALL_MONODROID, [test "x$with_monodroid" != "xno"])
AM_CONDITIONAL(INSTALL_MONOTOUCH, [test "x$with_monotouch" != "xno"])
AM_CONDITIONAL(INSTALL_MONOTOUCH_WATCH, [test "x$with_monotouch_watch" != "xno"])
AM_CONDITIONAL(INSTALL_XAMMAC, [test "x$with_xammac" != "xno"])

AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes)
Expand Down Expand Up @@ -3950,13 +3953,14 @@ echo "
LLVM Back End: $enable_llvm (dynamically loaded: $enable_loadedllvm)

Libraries:
.NET 4.6: $with_profile4_x
MonoDroid: $with_monodroid
MonoTouch: $with_monotouch
Xamarin.Mac: $with_xammac
JNI support: $jdk_headers_found
libgdiplus: $libgdiplus_msg
zlib: $zlib_msg
.NET 4.6: $with_profile4_x
MonoDroid: $with_monodroid
Xamarin.iOS: $with_monotouch
Xamarin.WatchOS: $with_monotouch_watch
Xamarin.Mac: $with_xammac
JNI support: $jdk_headers_found
libgdiplus: $libgdiplus_msg
zlib: $zlib_msg
$disabled
"
if test x$with_static_mono = xno -a "x$host_win32" != "xyes"; then
Expand Down
6 changes: 5 additions & 1 deletion runtime/Makefile.am
Expand Up @@ -37,7 +37,11 @@ build_profiles += monodroid
endif

if INSTALL_MONOTOUCH
build_profiles += monotouch monotouch_runtime monotouch_watch
build_profiles += monotouch monotouch_runtime
endif

if INSTALL_MONOTOUCH_WATCH
build_profiles += monotouch_watch
endif

if INSTALL_XAMMAC
Expand Down

0 comments on commit 7693e3d

Please sign in to comment.