From 8dfa2560b142a6dd6e9a386ca05cbadf7d6c6c40 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sat, 23 Jul 2011 00:48:19 -0700 Subject: Use a better method for determining if shared functions exist --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 475ac6f5..06da6950 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") INCLUDE(CheckFunctionExists) INCLUDE(CheckLibraryExists) -INCLUDE(CheckSharedLibraryExists) +INCLUDE(CheckSharedFunctionExists) INCLUDE(CheckIncludeFile) INCLUDE(CheckIncludeFiles) INCLUDE(CheckSymbolExists) @@ -350,7 +350,7 @@ IF(NOT HAVE_STDINT_H) ENDIF() # Windows needs winmm for timeGetTime, even if the backend is disabled -CHECK_SHARED_LIBRARY_EXISTS(winmm timeGetTime 0 "" HAVE_LIBWINMM) +CHECK_SHARED_FUNCTION_EXISTS(timeGetTime "windows.h;mmsystem.h" winmm "" HAVE_LIBWINMM) IF(HAVE_LIBWINMM) SET(EXTRA_LIBS winmm ${EXTRA_LIBS}) SET(PKG_CONFIG_LIBS ${PKG_CONFIG_LIBS} -lwinmm) @@ -402,7 +402,7 @@ SET(HAVE_WAVE 0) IF(ALSA) CHECK_INCLUDE_FILE(alsa/asoundlib.h HAVE_ALSA_ASOUNDLIB_H) IF(HAVE_ALSA_ASOUNDLIB_H) - CHECK_SHARED_LIBRARY_EXISTS(asound snd_pcm_open 4 "" HAVE_LIBASOUND) + CHECK_SHARED_FUNCTION_EXISTS(snd_pcm_open "alsa/asoundlib.h" asound "" HAVE_LIBASOUND) IF(HAVE_LIBASOUND OR HAVE_DLFCN_H OR WIN32) SET(HAVE_ALSA 1) SET(ALC_OBJS ${ALC_OBJS} Alc/alsa.c) @@ -449,7 +449,7 @@ ENDIF() IF(SNDIO) CHECK_INCLUDE_FILE(sndio.h HAVE_SNDIO_H) IF(HAVE_SNDIO_H) - CHECK_SHARED_LIBRARY_EXISTS(sndio sio_open 3 "" HAVE_LIBSNDIO) + CHECK_SHARED_FUNCTION_EXISTS(sio_open "sndio.h" sndio "" HAVE_LIBSNDIO) IF(HAVE_LIBSNDIO OR HAVE_DLFCN_H OR WIN32) SET(HAVE_SNDIO 1) SET(ALC_OBJS ${ALC_OBJS} Alc/sndio.c) @@ -486,7 +486,7 @@ ENDIF() IF(DSOUND) CHECK_INCLUDE_FILE(dsound.h HAVE_DSOUND_H) IF(HAVE_DSOUND_H) - CHECK_SHARED_LIBRARY_EXISTS(dsound DirectSoundCreate 3 "" HAVE_LIBDSOUND) + CHECK_SHARED_FUNCTION_EXISTS(DirectSoundCreate "dsound.h" dsound "" HAVE_LIBDSOUND) IF(HAVE_LIBDSOUND OR HAVE_DLFCN_H OR WIN32) SET(HAVE_DSOUND 1) SET(ALC_OBJS ${ALC_OBJS} Alc/dsound.c) @@ -522,7 +522,7 @@ ENDIF() IF(PORTAUDIO) CHECK_INCLUDE_FILE(portaudio.h HAVE_PORTAUDIO_H) IF(HAVE_PORTAUDIO_H) - CHECK_SHARED_LIBRARY_EXISTS(portaudio Pa_Initialize 0 "" HAVE_LIBPORTAUDIO) + CHECK_SHARED_FUNCTION_EXISTS(Pa_Initialize "portaudio.h" portaudio "" HAVE_LIBPORTAUDIO) IF(HAVE_LIBPORTAUDIO OR HAVE_DLFCN_H OR WIN32) SET(HAVE_PORTAUDIO 1) SET(ALC_OBJS ${ALC_OBJS} Alc/portaudio.c) @@ -543,7 +543,7 @@ ENDIF() IF(PULSEAUDIO) CHECK_INCLUDE_FILE(pulse/pulseaudio.h HAVE_PULSE_PULSEAUDIO_H) IF(HAVE_PULSE_PULSEAUDIO_H) - CHECK_SHARED_LIBRARY_EXISTS(pulse pa_context_new 2 "" HAVE_LIBPULSE) + CHECK_SHARED_FUNCTION_EXISTS(pa_context_new "pulse/pulseaudio.h" pulse "" HAVE_LIBPULSE) IF(HAVE_LIBPULSE OR HAVE_DLFCN_H OR WIN32) SET(HAVE_PULSEAUDIO 1) SET(ALC_OBJS ${ALC_OBJS} Alc/pulseaudio.c) @@ -580,7 +580,7 @@ ENDIF() IF(OPENSL) CHECK_INCLUDE_FILE(SLES/OpenSLES_Android.h HAVE_SLES_OPENSLES_ANDROID_H) IF(HAVE_SLES_OPENSLES_ANDROID_H) - CHECK_SHARED_LIBRARY_EXISTS(OpenSLES slCreateEngine 6 "" HAVE_LIBOPENSLES) + CHECK_SHARED_FUNCTION_EXISTS(slCreateEngine "SLES/OpenSLES.h" OpenSLES "" HAVE_LIBOPENSLES) IF(HAVE_LIBOPENSLES) SET(HAVE_OPENSL 1) SET(ALC_OBJS ${ALC_OBJS} Alc/opensl.c) -- cgit v1.2.3