qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 22:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

partial fixes for mingw cross builds. still have issues with ar :(

Browse source
This commit is contained in:
Bill Currie 2001-09-28 16:03:45 +00:00
parent 30f6d2f85c
commit 8e27422c72
3 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
configure.ac
View file

@ -46,6 +46,9 @@ case "$host_os" in
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/include/win32/resources" CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/include/win32/resources"
if test $host != $build; then if test $host != $build; then
CC=$host_cpu-$host_os-gcc CC=$host_cpu-$host_os-gcc
AS=$host_cpu-$host_os-gcc
AR=$host_cpu-$host_os-ar
RANLIB=$host_cpu-$host_os-ranlib
endian="little" endian="little"
fi fi
;; ;;
@ -59,6 +62,7 @@ AC_PROG_INSTALL
AC_PROG_CC AC_PROG_CC
AC_PROG_CPP AC_PROG_CPP
AC_PROG_LN_S AC_PROG_LN_S
AC_PROG_RANLIB
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
AC_PROG_YACC AC_PROG_YACC
AM_PROG_LEX AM_PROG_LEX
@ -102,7 +106,7 @@ AC_CHECK_HEADERS(
stdlib.h string.h strings.h sys/asoundlib.h sys/audioio.h sys/filio.h \ stdlib.h string.h strings.h sys/asoundlib.h sys/audioio.h sys/filio.h \
sys/ioctl.h sys/io.h sys/ipc.h sys/mman.h sys/param.h sys/poll.h \ sys/ioctl.h sys/io.h sys/ipc.h sys/mman.h sys/param.h sys/poll.h \
sys/shm.h sys/signal.h sys/socket.h sys/soundcard.h sys/stat.h \ sys/shm.h sys/signal.h sys/socket.h sys/soundcard.h sys/stat.h \
sys/time.h sys/types.h sys/wait.h time.h unistd.h vga.h \ sys/time.h sys/types.h sys/wait.h termios.h time.h unistd.h vga.h \
vgakeyboard.h vgamouse.h windows.h winsock.h zlib.h vgakeyboard.h vgamouse.h windows.h winsock.h zlib.h
) )
if test "x$mingw" = xyes; then if test "x$mingw" = xyes; then
@ -1451,6 +1455,10 @@ AC_SUBST(CFLAGS)
AC_SUBST(LDFLAGS) AC_SUBST(LDFLAGS)
AC_SUBST(LIBS) AC_SUBST(LIBS)
AC_SUBST(AS)
AC_SUBST(AR)
AC_SUBST(RANLIB)
dnl Output files dnl Output files
AC_OUTPUT( AC_OUTPUT(
Makefile Makefile

8
libs/console/server.c
View file

@ -46,8 +46,12 @@ static const char rcsid[] =
# include <unistd.h> # include <unistd.h>
#endif #endif
#include <sys/ioctl.h> #ifdef HAVE_SYS_IOCTL_H
#include <termios.h> # include <sys/ioctl.h>
#endif
#ifdef HAVE_TERMIOS_H
# include <termios.h>
#endif
#include <signal.h> #include <signal.h>
#include <stdlib.h> #include <stdlib.h>

9
qw/source/cl_sys_sdl.c
View file

@ -24,12 +24,15 @@
Boston, MA 02111-1307, USA Boston, MA 02111-1307, USA
*/ */
static const char rcsid[] = static const char rcsid[] =
"$Id$"; "$Id$";
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
#endif #endif
#ifdef _WIN32
# define shutdown win32_shutdown
#endif
#ifdef HAVE_CONIO_H #ifdef HAVE_CONIO_H
# include <conio.h> # include <conio.h>
#endif #endif
@ -62,6 +65,10 @@ static const char rcsid[] =
#include <SDL.h> #include <SDL.h>
#include <SDL_main.h> #include <SDL_main.h>
#ifdef _WIN32
# undef shutdown
#endif
#include "QF/sys.h" #include "QF/sys.h"
#include "QF/qargs.h" #include "QF/qargs.h"