Support for iPhoneOS/iPhoneSimulator in automake scripts

Signed-off-by: Maxime Gervais <gervais.maxime@gmail.com>

1 files changed, 39 insertions, 5 deletions

diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac
index d81e74a..2faa8cb 100644
--- a/Project/GNU/Library/configure.ac
+++ b/Project/GNU/Library/configure.ac
@@ -41,8 +41,11 @@ AC_ARG_ENABLE([gprof],            [AS_HELP_STRING([--enable-gprof],
 AC_ARG_ENABLE([universal_binary], [AS_HELP_STRING([--enable-universal_binary],  [Create Mac PPC/i386 Universal binary])],       , [enable_universal_binary=no])
 AC_ARG_ENABLE([arch-ppc],         [AS_HELP_STRING(([--enable-arch-ppc],         [Create Mac PPC architecture]))],               , [enable_arch_ppc=no])
 AC_ARG_ENABLE([arch-ppc64],       [AS_HELP_STRING(([--enable-arch-ppc64],       [Create Mac PPC64 architecture]))],             , [enable_arch_ppc64=no])
-AC_ARG_ENABLE([arch-i386],        [AS_HELP_STRING(([--enable-arch-i386],        [Create Mac i386 architecture]))],              , [enable_arch_i386=no])
-AC_ARG_ENABLE([arch-x86_64],      [AS_HELP_STRING(([--enable-arch-x86_64],      [Create Mac x86_64 architecture]))],            , [enable_arch_x86_64=no])
+AC_ARG_ENABLE([arch-i386],        [AS_HELP_STRING(([--enable-arch-i386],        [Create Mac/iPhone i386 architecture]))],       , [enable_arch_i386=no])
+AC_ARG_ENABLE([arch-x86_64],      [AS_HELP_STRING(([--enable-arch-x86_64],      [Create Mac/iPhone x86_64 architecture]))],     , [enable_arch_x86_64=no])
+AC_ARG_ENABLE([arch-armv7],       [AS_HELP_STRING(([--enable-arch-armv7],       [Create iPhone ARMv7 architecture]))],          , [enable_arch_armv7=no])
+AC_ARG_ENABLE([arch-armv7s],      [AS_HELP_STRING(([--enable-arch-armv7s],      [Create iPhone ARMv7s architecture]))],         , [enable_arch_armv7s=no])
+AC_ARG_ENABLE([arch-arm64],       [AS_HELP_STRING(([--enable-arch-arm64],       [Create iPhone ARM64 architecture]))],          , [enable_arch_arm64=no])
 AC_ARG_ENABLE([unicode],          [AS_HELP_STRING(([--disable-unicode],         [Disable unicode]))],                           , [enable_unicode=yes])
 AC_ARG_ENABLE([wstring_missing],  [AS_HELP_STRING(([--enable-wstring_missing],  [Disable wstring support (old compilers)]))],   , [enable_wstring_missing=no])
 AC_ARG_ENABLE([stream_missing],   [AS_HELP_STRING(([--enable-stream_missing],   [Disable stream support (old compilers)]))],    , [enable_stream_missing=no])
@@ -53,8 +56,10 @@ dnl AC_ARG_ENABLE([threads],          [AS_HELP_STRING(([--disable-threads],
 dnl -------------------------------------------------------------------------
 dnl With
 dnl
-AC_ARG_WITH([macosx-sdk],         [AS_HELP_STRING(([--with-macosx-sdk],         [Force the Mac SDK]))],                         , [with_macosx_sdk=no])
-AC_ARG_WITH([macosx-version-min], [AS_HELP_STRING(([--with-macosx-version-min], [Force the Mac Version]))],                     , [with_macosx_version_min=no])
+AC_ARG_WITH([macosx-sdk],           [AS_HELP_STRING(([--with-macosx-sdk],           [Force the Mac SDK]))],                         , [with_macosx_sdk=no])
+AC_ARG_WITH([macosx-version-min],   [AS_HELP_STRING(([--with-macosx-version-min],   [Force the Mac Version]))],                     , [with_macosx_version_min=no])
+AC_ARG_WITH([iphoneos-sdk],         [AS_HELP_STRING(([--with-iphoneos-sdk],         [Force the iPhone SDK]))],                      , [with_iphoneos_sdk=no])
+AC_ARG_WITH([iphoneos-version-min], [AS_HELP_STRING(([--with-iphoneos-version-min], [Force the iPhone Version]))],                  , [with_iphoneos_version_min=no])
 
 dnl #########################################################################
 dnl ### Compiler specific
@@ -69,7 +74,7 @@ case "${build}" in
 esac
 
 dnl -------------------------------------------------------------------------
-dnl Mac Architecture and SDK
+dnl Mac/iPhone Architecture and SDK
 dnl
 if test "$enable_universal_binary" = "yes"; then
 	enable_arch_ppc=yes
@@ -101,6 +106,21 @@ if test "$enable_arch_x86_64" = "yes"; then
 	CFLAGS="$CFLAGS -arch x86_64"
 	LDFLAGS="$LDFLAGS -arch x86_64"
 fi
+if test "$enable_arch_armv7" = "yes"; then
+	CXXFLAGS="$CXXFLAGS -arch armv7"
+	CFLAGS="$CFLAGS -arch armv7"
+	LDFLAGS="$LDFLAGS -arch armv7"
+fi
+if test "$enable_arch_armv7s" = "yes"; then
+	CXXFLAGS="$CXXFLAGS -arch armv7s"
+	CFLAGS="$CFLAGS -arch armv7s"
+	LDFLAGS="$LDFLAGS -arch armv7s"
+fi
+if test "$enable_arch_arm64" = "yes"; then
+	CXXFLAGS="$CXXFLAGS -arch arm64"
+	CFLAGS="$CFLAGS -arch arm64"
+	LDFLAGS="$LDFLAGS -arch arm64"
+fi
 if test "$with_macosx_sdk" = "yes" ; then
 	CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CXXFLAGS"
 	CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CFLAGS"
@@ -115,6 +135,20 @@ if test "x$with_macosx_version_min" != xno ; then
 	CFLAGS="-mmacosx-version-min=$with_macosx_version_min $CFLAGS"
 	LDFLAGS="-mmacosx-version-min=$with_macosx_version_min $LDFLAGS"
 fi
+if test "$with_iphoneos_sdk" = "yes" ; then
+	CXXFLAGS="-isysroot /Developer/SDKs/iPhoneOS.sdk $CXXFLAGS"
+	CFLAGS="-isysroot /Developer/SDKs/iPhoneOS.sdk $CFLAGS"
+	LDFLAGS="-isysroot /Developer/SDKs/iPhoneOS.sdk $LDFLAGS"
+elif test "x$with_iphoneos_sdk" != xno ; then
+	CXXFLAGS="-isysroot $with_iphoneos_sdk $CXXFLAGS"
+	CFLAGS="-isysroot $with_iphoneos_sdk $CFLAGS"
+	LDFLAGS="-isysroot $with_iphoneos_sdk $LDFLAGS"
+fi
+if test "x$with_iphoneos_version_min" != xno ; then
+	CXXFLAGS="-miphoneos-version-min=$with_iphoneos_version_min $CXXFLAGS"
+	CFLAGS="-miphoneos-version-min=$with_iphoneos_version_min $CFLAGS"
+	LDFLAGS="-miphoneos-version-min=$with_iphoneos_version_min $LDFLAGS"
+fi
 
 dnl #########################################################################
 dnl ### ZenLib flags