mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 00:39:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ifdef AVFoundation and CoreLocation specifically for HAVE_COCOA and/or

Browse Source 
HAVE_COCOATOUCH
This commit is contained in:
Twinaphex 2015-04-20 14:14:45 +02:00
parent b310e82def
commit 68993c1f71
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@ -755,11 +755,13 @@ ifneq ($(findstring Win32,$(OS)),)
endif endif
ifeq ($(HAVE_AVFOUNDATION), 1) ifeq ($(HAVE_AVFOUNDATION), 1)
ifeq ($(HAVE_COCOA), 1)
DEFINES += -DHAVE_AVFOUNDATION DEFINES += -DHAVE_AVFOUNDATION
LIBS += -framework AVFoundation LIBS += -framework AVFoundation
LIBS += -framework CoreVideo LIBS += -framework CoreVideo
LIBS += -framework CoreMedia LIBS += -framework CoreMedia
endif endif
endif
# Record # Record

4
camera/camera_driver.c
View File

@ -31,8 +31,10 @@ static const camera_driver_t *camera_drivers[] = {
#ifdef ANDROID #ifdef ANDROID
&camera_android, &camera_android,
#endif #endif
#ifdef HAVE_AVFOUNDATION #if defined(HAVE_AVFOUNDATION)
#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)
&camera_avfoundation, &camera_avfoundation,
#endif
#endif #endif
&camera_null, &camera_null,
NULL, NULL,

4
config.def.h
View File

@ -293,7 +293,7 @@ enum
#define CAMERA_DEFAULT_DRIVER CAMERA_RWEBCAM #define CAMERA_DEFAULT_DRIVER CAMERA_RWEBCAM
#elif defined(ANDROID) #elif defined(ANDROID)
#define CAMERA_DEFAULT_DRIVER CAMERA_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 #define CAMERA_DEFAULT_DRIVER CAMERA_AVFOUNDATION
#else #else
#define CAMERA_DEFAULT_DRIVER CAMERA_NULL #define CAMERA_DEFAULT_DRIVER CAMERA_NULL
@ -301,7 +301,7 @@ enum
#if defined(ANDROID) #if defined(ANDROID)
#define LOCATION_DEFAULT_DRIVER LOCATION_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 #define LOCATION_DEFAULT_DRIVER LOCATION_CORELOCATION
#else #else
#define LOCATION_DEFAULT_DRIVER LOCATION_NULL #define LOCATION_DEFAULT_DRIVER LOCATION_NULL

2
location/location_driver.c
View File

@ -26,7 +26,9 @@ static const location_driver_t *location_drivers[] = {
&location_android, &location_android,
#endif #endif
#ifdef HAVE_CORELOCATION #ifdef HAVE_CORELOCATION
#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)
&location_corelocation, &location_corelocation,
#endif
#endif #endif
&location_null, &location_null,
NULL, NULL,