qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win32 compile fixes. still have problems with DDActive, but Despair's going 

to look at that.
This commit is contained in:
Bill Currie 2002-07-02 18:45:50 +00:00
parent ec5440fccc
commit e5d8781150
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -412,10 +412,13 @@ case "$target_os" in
;;
esac
AM_PATH_VORBIS(HAVE_VORBIS=yes, HAVE_VOBIS=no)
AM_PATH_OGG(HAVE_OGG=yes, HAVE_OGG=no)
if test $HAVE_OGG = yes; then
AM_PATH_VORBIS(HAVE_VORBIS=yes, HAVE_VORBIS=no)
if test $HAVE_VORBIS = yes; then
AC_DEFINE(HAVE_VORBIS, 1, [define this if you have ogg/vorbis libs])
fi
fi
AC_ARG_ENABLE(zlib,
[ --disable-zlib disable zlib support],

4
libs/audio/renderer/Makefile.am
View File

@ -21,10 +21,10 @@ libasm_la_SOURCES= snd_mixa.S
libsnd_render_default_la_LDFLAGS= $(plugin_ldflags)
libsnd_render_default_la_SOURCES= snd_dma.c snd_mem.c snd_mix.c vorbis.c
if ASM_ARCH
libsnd_render_default_la_LIBADD= $(asm) $(VORBISFILE_LIBS) $(VORBIS_LIBS)
libsnd_render_default_la_LIBADD= $(asm) $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(OGG_LIBS)
libsnd_render_default_la_DEPENDENCIES= $(asm)
else
libsnd_render_default_la_LIBADD= $(VORBISFILE_LIBS) $(VORBIS_LIBS)
libsnd_render_default_la_LIBADD= $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(OGG_LIBS)
libsnd_render_default_la_DEPENDENCIES=
endif

2
libs/video/targets/vid_sgl.c
View File

@ -75,7 +75,7 @@ void * (* glGetProcAddress) (const char *symbol) = NULL; // FIXME
// the following is to avoid other compiler errors
#ifdef _WIN32
void * (* getProcAddress) (HINSTANCE, LPCSTR);
FARPROC (WINAPI *getProcAddress) (HINSTANCE, LPCSTR);
#else
void * (* getProcAddress) (void *, const char *);
#endif