mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-11-13 00:24:12 +00:00
[build] Correct cygwin system type
cygwin is not windows, so trying to build a win32 app on cygwin-native doesn't work too well.
This commit is contained in:
parent
e36adb07ec
commit
1cd6a174fe
5 changed files with 28 additions and 22 deletions
|
@ -59,10 +59,12 @@ AC_SUBST(SGI_CD_LIBS)
|
||||||
|
|
||||||
AC_EGREP_CPP([QF_maGiC_VALUE],
|
AC_EGREP_CPP([QF_maGiC_VALUE],
|
||||||
[
|
[
|
||||||
|
#ifdef _WIN32
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <mmsystem.h>
|
#include <mmsystem.h>
|
||||||
#if defined(MCI_SET_DOOR_OPEN)
|
#if defined(MCI_SET_DOOR_OPEN)
|
||||||
QF_maGiC_VALUE
|
QF_maGiC_VALUE
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
],
|
],
|
||||||
CDTYPE="$CDTYPE WIN32"
|
CDTYPE="$CDTYPE WIN32"
|
||||||
|
|
|
@ -238,6 +238,7 @@ QF_maGiC_VALUE
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl Win32
|
dnl Win32
|
||||||
|
if test "x$SYSTYPE" = xWIN32; then
|
||||||
if test "x$ac_cv_header_windows_h" = "xyes"; then
|
if test "x$ac_cv_header_windows_h" = "xyes"; then
|
||||||
SOUND_TYPES="$SOUND_TYPES Win32"
|
SOUND_TYPES="$SOUND_TYPES Win32"
|
||||||
QF_NEED(snd_output, [win])
|
QF_NEED(snd_output, [win])
|
||||||
|
@ -260,6 +261,7 @@ QF_maGiC_VALUE
|
||||||
)
|
)
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
AC_SUBST(WINSND_LIBS)
|
AC_SUBST(WINSND_LIBS)
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -19,9 +19,7 @@ case "$host_os" in
|
||||||
;;
|
;;
|
||||||
cygwin*)
|
cygwin*)
|
||||||
cygwin=yes
|
cygwin=yes
|
||||||
SYSTYPE=WIN32
|
|
||||||
AC_DEFINE(NEED_GNUPRINTF)
|
AC_DEFINE(NEED_GNUPRINTF)
|
||||||
FNM_FLAGS="-I\$(top_srcdir)/include/win32"
|
|
||||||
if test "x$host" != "x$build"; then
|
if test "x$host" != "x$build"; then
|
||||||
CC="$host_cpu-$host_os-gcc"
|
CC="$host_cpu-$host_os-gcc"
|
||||||
AS="$CC"
|
AS="$CC"
|
||||||
|
|
|
@ -91,7 +91,7 @@ case "${host}" in
|
||||||
|
|
||||||
;;
|
;;
|
||||||
i?86-*-cygwin*|x86_64-*-cygwin*)
|
i?86-*-cygwin*|x86_64-*-cygwin*)
|
||||||
SYSTYPE=WIN32
|
#SYSTYPE=WIN32
|
||||||
AC_MSG_RESULT([Win32 driver])
|
AC_MSG_RESULT([Win32 driver])
|
||||||
WIN32_LIBS=' $(NET_LIBS)'
|
WIN32_LIBS=' $(NET_LIBS)'
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -940,7 +940,11 @@ Sys_ConsoleInput (void)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
static jmp_buf aiee_abort;
|
static jmp_buf aiee_abort;
|
||||||
|
#else
|
||||||
|
static sigjmp_buf aiee_abort;
|
||||||
|
#endif
|
||||||
|
|
||||||
typedef struct sh_stack_s {
|
typedef struct sh_stack_s {
|
||||||
struct sh_stack_s *next;
|
struct sh_stack_s *next;
|
||||||
|
|
Loading…
Reference in a new issue