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

[build] Correct cygwin system type

Browse source 
cygwin is not windows, so trying to build a win32 app on cygwin-native
doesn't work too well.
This commit is contained in:
Bill Currie 2022-09-19 16:36:29 +01:00
parent e36adb07ec
commit 1cd6a174fe
5 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.d/cdrom.m4
View file

@ -59,10 +59,12 @@ AC_SUBST(SGI_CD_LIBS)
AC_EGREP_CPP([QF_maGiC_VALUE],
[
#ifdef _WIN32
#include <windows.h>
#include <mmsystem.h>
#if defined(MCI_SET_DOOR_OPEN)
QF_maGiC_VALUE
#endif
#endif
],
CDTYPE="$CDTYPE WIN32"

40
config.d/sound.m4
View file

@ -238,26 +238,28 @@ QF_maGiC_VALUE
fi
dnl Win32
if test "x$ac_cv_header_windows_h" = "xyes"; then
SOUND_TYPES="$SOUND_TYPES Win32"
QF_NEED(snd_output, [win])
QF_NEED(snd_render, [default])
WINSND_LIBS="-lwinmm"
if test "x$ac_cv_header_dsound_h" = "xyes"; then
AC_EGREP_CPP([QF_maGiC_VALUE],
[
#include <windows.h>
#include <dsound.h>
#ifdef GMEM_MOVEABLE
# ifdef DirectSoundEnumerate
QF_maGiC_VALUE
# endif
#endif
],
SOUND_TYPES="$SOUND_TYPES DirectX"
QF_NEED(snd_output, [dx])
if test "x$SYSTYPE" = xWIN32; then
if test "x$ac_cv_header_windows_h" = "xyes"; then
SOUND_TYPES="$SOUND_TYPES Win32"
QF_NEED(snd_output, [win])
QF_NEED(snd_render, [default])
)
WINSND_LIBS="-lwinmm"
if test "x$ac_cv_header_dsound_h" = "xyes"; then
AC_EGREP_CPP([QF_maGiC_VALUE],
[
#include <windows.h>
#include <dsound.h>
#ifdef GMEM_MOVEABLE
# ifdef DirectSoundEnumerate
QF_maGiC_VALUE
# endif
#endif
],
SOUND_TYPES="$SOUND_TYPES DirectX"
QF_NEED(snd_output, [dx])
QF_NEED(snd_render, [default])
)
fi
fi
fi
AC_SUBST(WINSND_LIBS)

2
config.d/windows.m4
View file

@ -19,9 +19,7 @@ case "$host_os" in
;;
cygwin*)
cygwin=yes
SYSTYPE=WIN32
AC_DEFINE(NEED_GNUPRINTF)
FNM_FLAGS="-I\$(top_srcdir)/include/win32"
if test "x$host" != "x$build"; then
CC="$host_cpu-$host_os-gcc"
AS="$CC"

2
configure.ac
View file

@ -91,7 +91,7 @@ case "${host}" in
;;
i?86-*-cygwin*|x86_64-*-cygwin*)
SYSTYPE=WIN32
#SYSTYPE=WIN32
AC_MSG_RESULT([Win32 driver])
WIN32_LIBS=' $(NET_LIBS)'
;;

4
libs/util/sys.c
View file

@ -940,7 +940,11 @@ Sys_ConsoleInput (void)
#endif
}
#ifdef _WIN32
static jmp_buf aiee_abort;
#else
static sigjmp_buf aiee_abort;
#endif
typedef struct sh_stack_s {
struct sh_stack_s *next;