Fixes for portability issues..

This commit is contained in:
Zephaniah E. Hull 2000-01-05 16:55:01 +00:00
parent 4ecda582f4
commit b68f84619e
6 changed files with 12 additions and 11 deletions

View file

@ -47,16 +47,9 @@ static int lastwrite = 0;
qboolean SNDDMA_Init(void)
{
int rc;
int fmt;
int tmp;
int i;
char *s;
int caps;
if (snd_inited) {
printf("Sound already init'd\n");
return;
return 0;
}
shm = &sn;

View file

@ -14,7 +14,7 @@ AC_PROG_MAKE_SET
dnl Checks for header files.
AC_CHECK_HEADERS(unistd.h windows.h sys/ioctl.h sys/mman.h \
sys/socket.h netinet/in.h netdb.h arpa/inet.h \
sys/socket.h netinet/in.h netdb.h arpa/inet.h sys/filio.h \
sys/soundcard.h linux/soundcard.h machine/soundcard.h sys/audioio.h \
dsound.h mmsystem.h initguid.h mme/mmsystem.h mme/mme_public.h \
sys/asoundlib.h)

View file

@ -115,6 +115,7 @@ CL_ADDITIONAL_GENERAL_SRC = sys_dosa.s math.s
SWREND_SRC_PLAT = d_draw.s d_draw16.s d_parta.s d_polysa.s d_scana.s \
d_spr8.s d_varsa.s r_aclipa.s r_aliasa.s \
r_drawa.s r_edgea.s r_varsa.s surf16.s surf8.s
XTRA_SND_SRC = snd_mixa.s
else
# Source files for non-Intel platforms
SWREND_SRC_PLAT = nonintel.c
@ -146,7 +147,7 @@ ifeq ($(SND_STYLE),Windows)
SND_SRC = snd_dma.c snd_win.c
endif
SND_SRC += snd_mem.c snd_mix.c snd_mixa.s
SND_SRC += snd_mem.c snd_mix.c $(XTRA_SND_SRC)
X11_VID_SRC = @X11_VID_SRC@
QW_X11_VID_SRC = vid_x.c

View file

@ -46,6 +46,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_SYS_FILIO_H
# include <sys/filio.h>
#endif
#undef model_t

View file

@ -105,6 +105,7 @@ CL_ADDITIONAL_GENERAL_SRC = sys_dosa.s math.s
SWREND_SRC_PLAT = d_draw.s d_draw16.s d_parta.s d_polysa.s d_scana.s \
d_spr8.s d_varsa.s r_aclipa.s r_aliasa.s \
r_drawa.s r_edgea.s r_varsa.s surf16.s surf8.s
XTRA_SND_SRC = snd_mixa.s
else
# Source files for non-Intel platforms
SWREND_SRC_PLAT = nonintel.c
@ -137,7 +138,7 @@ ifeq ($(SND_STYLE),Windows)
SND_SRC = snd_dma.c snd_win.c
endif
SND_SRC += snd_mem.c snd_mix.c snd_mixa.s
SND_SRC += snd_mem.c snd_mix.c $(XTRA_SND_SRC)
# x11 vid

View file

@ -46,6 +46,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_SYS_FILIO_H
# include <sys/filio.h>
#endif
#undef model_t