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

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

Browse source 
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

7
configure.ac
View file

@ -412,9 +412,12 @@ case "$target_os" in
;; ;;
esac esac
AM_PATH_VORBIS(HAVE_VORBIS=yes, HAVE_VOBIS=no) AM_PATH_OGG(HAVE_OGG=yes, HAVE_OGG=no)
if test $HAVE_VORBIS = yes; then 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]) AC_DEFINE(HAVE_VORBIS, 1, [define this if you have ogg/vorbis libs])
fi
fi fi
AC_ARG_ENABLE(zlib, AC_ARG_ENABLE(zlib,

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_LDFLAGS= $(plugin_ldflags)
libsnd_render_default_la_SOURCES= snd_dma.c snd_mem.c snd_mix.c vorbis.c libsnd_render_default_la_SOURCES= snd_dma.c snd_mem.c snd_mix.c vorbis.c
if ASM_ARCH 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) libsnd_render_default_la_DEPENDENCIES= $(asm)
else 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= libsnd_render_default_la_DEPENDENCIES=
endif 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 // the following is to avoid other compiler errors
#ifdef _WIN32 #ifdef _WIN32
void * (* getProcAddress) (HINSTANCE, LPCSTR); FARPROC (WINAPI *getProcAddress) (HINSTANCE, LPCSTR);
#else #else
void * (* getProcAddress) (void *, const char *); void * (* getProcAddress) (void *, const char *);
#endif #endif