Index: configure.ac ================================================================== --- configure.ac +++ configure.ac @@ -17,13 +17,10 @@ BUILDSYS_INIT AC_CANONICAL_HOST -AC_ARG_WITH(ixemul, - AS_HELP_STRING([--with-ixemul], [build with ixemul])) - dnl Used to disable checking for -pedantic on some platforms where it's broken check_pedantic="yes" case "$host" in arm-*-riscos*) @@ -76,35 +73,33 @@ enable_shared="no" AC_SUBST(LIBBASES_M, libbases.m) ;; *-morphos*) - AS_IF([test x"$with_ixemul" != x"yes"], [ - AS_IF([test x"$OBJCFLAGS" = x""], [ - OBJCFLAGS="-O2 -g" - ]) - OBJCFLAGS="$OBJCFLAGS -noixemul" - OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS -noixemul" - LDFLAGS="$LDFLAGS -noixemul" - enable_files="yes" # Required for reading ENV: - supports_amiga_lib="yes" - check_pedantic="no" # Breaks generated inlines - - AS_IF([test x"$enable_amiga_lib" != x"no"], [ - AC_SUBST(OBJFWRT_AMIGA_LIB, objfwrt.library) - AC_SUBST(CVINCLUDE_INLINE_H, inline.h) - t="-mresident32 -ffreestanding -noixemul" - AC_SUBST(AMIGA_LIB_CFLAGS, $t) - t="-mresident32 -nostartfiles -nodefaultlibs" - t="$t -noixemul -lc" - AC_SUBST(AMIGA_LIB_LDFLAGS, $t) - ]) - - AC_SUBST(LIBBASES_M, libbases.m) - ]) - + AS_IF([test x"$OBJCFLAGS" = x""], [ + OBJCFLAGS="-O2 -g" + ]) + OBJCFLAGS="$OBJCFLAGS -noixemul" + OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS -noixemul" + LDFLAGS="$LDFLAGS -noixemul" + + enable_files="yes" # Required for reading ENV: enable_shared="no" + supports_amiga_lib="yes" + check_pedantic="no" # Breaks generated inlines + + AS_IF([test x"$enable_amiga_lib" != x"no"], [ + AC_SUBST(OBJFWRT_AMIGA_LIB, objfwrt.library) + AC_SUBST(CVINCLUDE_INLINE_H, inline.h) + t="-mresident32 -ffreestanding -noixemul" + AC_SUBST(AMIGA_LIB_CFLAGS, $t) + t="-mresident32 -nostartfiles -nodefaultlibs" + t="$t -noixemul -lc" + AC_SUBST(AMIGA_LIB_LDFLAGS, $t) + ]) + + AC_SUBST(LIBBASES_M, libbases.m) ;; *-msdosdjgpp*) enable_shared="no" enable_threads="no" enable_sockets="no" Index: src/platform.h ================================================================== --- src/platform.h +++ src/platform.h @@ -127,16 +127,12 @@ #elif defined(__HAIKU__) # define OF_HAIKU #elif defined(_AIX) # define OF_AIX #elif defined(__MORPHOS__) -# ifndef __ixemul__ -# define OF_MORPHOS -# define OF_AMIGAOS -# else -# define OF_MORPHOS_IXEMUL -# endif +# define OF_MORPHOS +# define OF_AMIGAOS #elif defined(__amigaos4__) # define OF_AMIGAOS4 # define OF_AMIGAOS #elif defined(__amigaos__) # define OF_AMIGAOS_M68K Index: src/socket.h ================================================================== --- src/socket.h +++ src/socket.h @@ -82,14 +82,10 @@ typedef long socklen_t; typedef u_char sa_family_t; typedef u_short in_port_t; #endif -#ifdef OF_MORPHOS_IXEMUL -typedef int socklen_t; -#endif - /** * @brief A socket address family. */ typedef enum { /** An unknown address family. */ Index: src/socket_helpers.h ================================================================== --- src/socket_helpers.h +++ src/socket_helpers.h @@ -71,14 +71,10 @@ # endif #elif !defined(OF_WINDOWS) && !defined(OF_WII) # define closesocket(sock) close(sock) #endif -#ifdef OF_MORPHOS_IXEMUL -typedef uint32_t in_addr_t; -#endif - #ifdef OF_WII # define accept(sock, addr, addrlen) net_accept(sock, addr, addrlen) # define bind(sock, addr, addrlen) net_bind(sock, addr, addrlen) # define closesocket(sock) net_close(sock) # define connect(sock, addr, addrlen) \