applied tim's patch

The following patch allows Quakeforge to be compiled with the
native compilers on Solaris, Irix, and AIX.
This commit is contained in:
Nelson Rush 2000-01-06 17:29:23 +00:00
parent 6e9074153f
commit b794e155b0
3 changed files with 24 additions and 3 deletions

View file

@ -400,6 +400,27 @@ if test "x$RELEASE" = xyes; then
fi
fi
dnl Quakeforge code has lots of C++ comments, which cause
dnl problems with any compiler that is ANSI/ISO-C compliant.
dnl Make the compiler swallow its pride...
if test "x$GCC" != xyes; then
case "$target" in
*-aix*)
CFLAGS="$CFLAGS -qcpluscmt"
;;
*-irix6*)
CFLAGS="$CFLAGS -Xcpluscomm"
;;
*-solaris*)
CFLAGS="$CFLAGS -xCC"
;;
esac
fi
dnl We want warnings, lots of warnings...
if test "x$GCC" = xyes; then
CFLAGS="$CFLAGS -Wall -pedantic"
fi
dnl Check for ia32
AC_MSG_CHECKING(for an ia32 machine)

View file

@ -195,7 +195,7 @@ CL_COMMON_SRC = $(MISC_SRC) $(CL_GUI_SRC) $(CL_SRC) \
# Directory specific stuff
#
DEFS = @DEFS@
CFLAGS = @CFLAGS@ -Wall -DQUAKEWORLD $(OPTFLAGS) $(DEFS) -I. \
CFLAGS = @CFLAGS@ -DQUAKEWORLD $(OPTFLAGS) $(DEFS) -I. \
$(SRC_DIR_INC) -I$(QW_COMMON_DIR) -I$(COMMON_ODIR) -I$(COMMON_DIR)
GENERAL_SRC = $(CL_COMMON_SRC) \

View file

@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "quakedef.h"
#include "winquake.h"
#ifdef __sun__
#ifdef __sun
/* Sun's model_t in sys/model.h conflicts w/ Quake's model_t */
#define model_t sunmodel_t
#endif
@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <netinet/in.h>
#endif
#ifdef __sun__
#ifdef __sun
#undef model_t
#endif