diff -Naur --exclude=Makefile.in quakeforge-0.5.4-orig/configure.ac quakeforge-0.5.4/configure.ac --- quakeforge-0.5.4-orig/configure.ac Fri Jul 18 00:35:48 2003 +++ quakeforge-0.5.4/configure.ac Mon Aug 4 22:53:46 2003 @@ -49,21 +49,21 @@ export AR endian="" -case "$host_os" in +case "$target_os" in mingw32*) mingw=yes CFLAGS="$CFLAGS -I\$(top_srcdir)/include/win32" - if test "$host" != "$build"; then + if test "$target" != "$build"; then case "$build_os" in cygwin*) CFLAGS="$CFLAGS -mno-cygwin -mconsole" CPPFLAGS="$CPPFLAGS $CFLAGS" ;; *) - CC="$host_cpu-$host_os-gcc" + CC="$target_cpu-$target_os-gcc" AS="$CC" - AR="$host_cpu-$host_os-ar" - RANLIB="$host_cpu-$host_os-ranlib" + AR="$target_cpu-$target_os-ar" + RANLIB="$target_cpu-$target_os-ranlib" ;; esac fi @@ -71,11 +71,11 @@ ;; cygwin*) cygwin=yes - if test "$host" != "$build"; then - CC="$host_cpu-$host_os-gcc" + if test "$target" != "$build"; then + CC="$target_cpu-$target_os-gcc" AS="$CC" - AR="$host_cpu_$host_os-ar" - RANLIB="$host_cpu-$host_os-ranlib" + AR="$target_cpu_$target_os-ar" + RANLIB="$target_cpu-$target_os-ranlib" endian="little" fi ;; @@ -721,7 +721,7 @@ HAVE_SDL=no) AC_SUBST(HAVE_SDL) if test "x$HAVE_SDL" = "xyes"; then - case "$host_os" in + case "$target_os" in mingw*) case "$build_os" in cygwin*) @@ -752,7 +752,7 @@ dnl Checks for which system driver to use AC_MSG_CHECKING(for system driver) -case "${host}" in +case "${target}" in i?86-*-mingw32*) SYSTYPE=WIN32 AC_MSG_RESULT([Win32 driver]) @@ -774,7 +774,7 @@ dnl Check for ia32 AC_MSG_CHECKING(for an ia32 machine) -case "${host}" in +case "${target}" in i?86-*-*) AC_MSG_RESULT(yes) AC_MSG_CHECKING(to see if we should disable asm optimizations) @@ -1433,7 +1433,7 @@ dnl Make the compiler swallow its pride... if test "x$GCC" != xyes; then AC_MSG_CHECKING(for how to deal with BCPL-style comments) - case "${host}" in + case "${target}" in *-aix*) CFLAGS="$CFLAGS -qcpluscmt" AC_MSG_RESULT([-qcpluscmt]) diff -Naur --exclude=Makefile.in quakeforge-0.5.4-orig/libs/net/nc/net_udp.c quakeforge-0.5.4/libs/net/nc/net_udp.c --- quakeforge-0.5.4-orig/libs/net/nc/net_udp.c Thu Jun 26 22:24:46 2003 +++ quakeforge-0.5.4/libs/net/nc/net_udp.c Mon Aug 4 22:48:34 2003 @@ -61,6 +61,9 @@ #ifdef NeXT # include #endif +#ifdef __MINT__ +# include +#endif #include #include @@ -359,8 +362,23 @@ if ((newsocket = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) Sys_Error ("UDP_OpenSocket: socket:%s", strerror (errno)); +#if defined(__MINT__) + { + _true = fcntl (newsocket, F_GETFL, 0); + if (_true < 0) + Sys_Error ("UDP_OpenSocket: fnctl F_GETFL:%s", strerror (errno)); + else + { + _true |= O_NDELAY; + _true = fcntl (newsocket, F_SETFL, _true); + if (_true < 0) + Sys_Error ("UDP_OpenSocket: fnctl F_SETFL:%s", strerror (errno)); + } + } +#else if (ioctl (newsocket, FIONBIO, &_true) == -1) Sys_Error ("UDP_OpenSocket: ioctl FIONBIO:%s", strerror (errno)); +#endif address.sin_family = AF_INET; // ZOID -- check for interface binding option if ((i = COM_CheckParm ("-ip")) != 0 && i < com_argc) { diff -Naur --exclude=Makefile.in quakeforge-0.5.4-orig/libs/net/nm/net_udp.c quakeforge-0.5.4/libs/net/nm/net_udp.c --- quakeforge-0.5.4-orig/libs/net/nm/net_udp.c Wed Jul 9 00:39:44 2003 +++ quakeforge-0.5.4/libs/net/nm/net_udp.c Mon Aug 4 22:49:56 2003 @@ -73,6 +73,9 @@ #ifdef NeXT # include #endif +#ifdef __MINT__ +# include +#endif #include #include @@ -211,8 +214,23 @@ if ((newsocket = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) return -1; +#if defined(__MINT__) + { + _true = fcntl (newsocket, F_GETFL, 0); + if (_true < 0) + goto ErrorReturn; + else + { + _true |= O_NDELAY; + _true = fcntl (newsocket, F_SETFL, _true); + if (_true < 0) + goto ErrorReturn; + } + } +#else if (ioctl (newsocket, FIONBIO, &_true) == -1) goto ErrorReturn; +#endif address.sin_family = AF_INET; address.sin_addr.s_addr = INADDR_ANY; diff -Naur --exclude=Makefile.in quakeforge-0.5.4-orig/libs/util/plugin.c quakeforge-0.5.4/libs/util/plugin.c --- quakeforge-0.5.4-orig/libs/util/plugin.c Thu Jun 5 19:51:49 2003 +++ quakeforge-0.5.4/libs/util/plugin.c Mon Aug 4 23:07:33 2003 @@ -103,6 +103,8 @@ return (dlclose (handle) == 0); #elif defined (_WIN32) return (FreeLibrary (handle) == 0); +#else + return 0; #endif } @@ -113,6 +115,8 @@ return dlsym (handle, name); #elif defined (_WIN32) return GetProcAddress (handle, name); +#else + return NULL; #endif } @@ -124,7 +128,9 @@ # ifdef __OpenBSD__ int flags = RTLD_LAZY; # else +# if defined(HAVE_DLOPEN) int flags = RTLD_NOW; +# endif # endif #endif @@ -142,6 +148,8 @@ pi_error = "LoadLibrary failed"; return 0; } +#else + dlhand = NULL; #endif pi_error = ""; return dlhand; @@ -155,7 +163,8 @@ #elif defined(_WIN32) const char *format = "%s/QF%s_%s.dll"; #else -# error "No shared library support. FIXME" + const char *format = "%s/%s_%s.so"; +/*# error "No shared library support. FIXME"*/ #endif snprintf (realname, size, format, fs_pluginpath->string, type, name); diff -Naur --exclude=Makefile.in quakeforge-0.5.4-orig/nq/source/host.c quakeforge-0.5.4/nq/source/host.c --- quakeforge-0.5.4-orig/nq/source/host.c Wed Jul 9 00:39:44 2003 +++ quakeforge-0.5.4/nq/source/host.c Mon Aug 4 23:28:17 2003 @@ -843,7 +844,7 @@ Cvar_SetFlags (host_mem_size, host_mem_size->flags | CVAR_ROM); - mem_size = (int) (host_mem_size->value * 1024 * 1024); + mem_size = host_mem_size->int_val * 1024 * 1024; if (mem_size < minimum_memory) Sys_Error ("Only %4.1f megs of memory reported, can't execute game", diff -Naur --exclude=Makefile.in quakeforge-0.5.4-orig/nq/source/sys_unixd.c quakeforge-0.5.4/nq/source/sys_unixd.c --- quakeforge-0.5.4-orig/nq/source/sys_unixd.c Wed Apr 16 07:06:19 2003 +++ quakeforge-0.5.4/nq/source/sys_unixd.c Mon Aug 4 23:10:07 2003 @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include