diff --git a/Makefile.common b/Makefile.common index fb911529eb..1777179eb3 100644 --- a/Makefile.common +++ b/Makefile.common @@ -755,11 +755,13 @@ ifneq ($(findstring Win32,$(OS)),) endif ifeq ($(HAVE_AVFOUNDATION), 1) +ifeq ($(HAVE_COCOA), 1) DEFINES += -DHAVE_AVFOUNDATION LIBS += -framework AVFoundation LIBS += -framework CoreVideo LIBS += -framework CoreMedia endif +endif # Record diff --git a/camera/camera_driver.c b/camera/camera_driver.c index e5d634404e..fa6e558086 100644 --- a/camera/camera_driver.c +++ b/camera/camera_driver.c @@ -31,8 +31,10 @@ static const camera_driver_t *camera_drivers[] = { #ifdef ANDROID &camera_android, #endif -#ifdef HAVE_AVFOUNDATION +#if defined(HAVE_AVFOUNDATION) +#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) &camera_avfoundation, +#endif #endif &camera_null, NULL, diff --git a/config.def.h b/config.def.h index 5d0739a19e..64b8674aaf 100644 --- a/config.def.h +++ b/config.def.h @@ -293,7 +293,7 @@ enum #define CAMERA_DEFAULT_DRIVER CAMERA_RWEBCAM #elif defined(ANDROID) #define CAMERA_DEFAULT_DRIVER CAMERA_ANDROID -#elif defined(HAVE_AVFOUNDATION) +#elif defined(HAVE_AVFOUNDATION) && (defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)) #define CAMERA_DEFAULT_DRIVER CAMERA_AVFOUNDATION #else #define CAMERA_DEFAULT_DRIVER CAMERA_NULL @@ -301,7 +301,7 @@ enum #if defined(ANDROID) #define LOCATION_DEFAULT_DRIVER LOCATION_ANDROID -#elif defined(HAVE_CORELOCATION) +#elif defined(HAVE_CORELOCATION) && (defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)) #define LOCATION_DEFAULT_DRIVER LOCATION_CORELOCATION #else #define LOCATION_DEFAULT_DRIVER LOCATION_NULL diff --git a/location/location_driver.c b/location/location_driver.c index bddab56659..f6edd2f4a8 100644 --- a/location/location_driver.c +++ b/location/location_driver.c @@ -26,7 +26,9 @@ static const location_driver_t *location_drivers[] = { &location_android, #endif #ifdef HAVE_CORELOCATION +#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) &location_corelocation, +#endif #endif &location_null, NULL,