diff --git a/configure.ac b/configure.ac index f03cd1dd3..7d7a8439d 100644 --- a/configure.ac +++ b/configure.ac @@ -412,9 +412,12 @@ case "$target_os" in ;; esac -AM_PATH_VORBIS(HAVE_VORBIS=yes, HAVE_VOBIS=no) -if test $HAVE_VORBIS = yes; then - AC_DEFINE(HAVE_VORBIS, 1, [define this if you have ogg/vorbis libs]) +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, diff --git a/libs/audio/renderer/Makefile.am b/libs/audio/renderer/Makefile.am index 1b1dd0dea..23db98434 100644 --- a/libs/audio/renderer/Makefile.am +++ b/libs/audio/renderer/Makefile.am @@ -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 diff --git a/libs/video/targets/vid_sgl.c b/libs/video/targets/vid_sgl.c index f19b2dcbf..8a85c15fc 100644 --- a/libs/video/targets/vid_sgl.c +++ b/libs/video/targets/vid_sgl.c @@ -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