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

Change HAVE_CAMERA defines to HAVE_AVFOUNDATION

Browse Source
This commit is contained in:
Twinaphex 2015-04-20 11:44:28 +02:00
parent 813a47d43c
commit 10d8d2e8c7
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apple/common/apple_cocoa_common.m
View File

@ -624,7 +624,7 @@ static bool apple_camera_poll(void *data, retro_camera_frame_raw_framebuffer_t f
return true; return true;
} }
camera_driver_t camera_apple = { camera_driver_t camera_avfoundation = {
apple_camera_init, apple_camera_init,
apple_camera_free, apple_camera_free,
apple_camera_start, apple_camera_start,

2
apple/iOS/Makefile
View File

@ -24,7 +24,7 @@ ${APPLICATION_NAME}_FILES = $(SRC_DIR)/griffin/griffin.c \
$(SRC_DIR)/apple/common/utility.m \ $(SRC_DIR)/apple/common/utility.m \
COMMON_FLAGS := -DIOS -DHAVE_GRIFFIN -DHAVE_CORELOCATION -DHAVE_NETPLAY -DHAVE_RGUI -DHAVE_MENU -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DRARCH_MOBILE -std=gnu99 -DHAVE_COREAUDIO -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_ZLIB -DWANT_ZLIB -DSINC_LOWER_QUALITY -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_XMB -D_LZMA_UINT32_IS_ULONG -DHAVE_STRL COMMON_FLAGS := -DIOS -DHAVE_GRIFFIN -DHAVE_CORELOCATION -DHAVE_NETPLAY -DHAVE_RGUI -DHAVE_MENU -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DRARCH_MOBILE -std=gnu99 -DHAVE_COREAUDIO -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_ZLIB -DWANT_ZLIB -DSINC_LOWER_QUALITY -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_XMB -D_LZMA_UINT32_IS_ULONG -DHAVE_STRL
COMMON_FLAGS += -DHAVE_CAMERA COMMON_FLAGS += -DHAVE_AVFOUNDATION
COMMON_IOS_FLAGS := -Wno-deprecated-declarations -Wno-error COMMON_IOS_FLAGS := -Wno-deprecated-declarations -Wno-error
COMMON_IOS_OBJCFLAGS := -fobjc-arc COMMON_IOS_OBJCFLAGS := -fobjc-arc
INCFLAGS := -I$(SRC_DIR) -I$(SRC_DIR)/libretro-common/include INCFLAGS := -I$(SRC_DIR) -I$(SRC_DIR)/libretro-common/include

16
apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj
View File

@ -498,7 +498,7 @@
"-DHAVE_NETPLAY", "-DHAVE_NETPLAY",
"-DHAVE_HID", "-DHAVE_HID",
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_CAMERA", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_CORETEXT", "-DHAVE_CORETEXT",
"-DHAVE_CORELOCATION", "-DHAVE_CORELOCATION",
@ -563,7 +563,7 @@
"-DHAVE_NETPLAY", "-DHAVE_NETPLAY",
"-DHAVE_HID", "-DHAVE_HID",
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_CAMERA", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_CORELOCATION", "-DHAVE_CORELOCATION",
"-DHAVE_RGUI", "-DHAVE_RGUI",
@ -600,7 +600,7 @@
"-DHAVE_NETPLAY", "-DHAVE_NETPLAY",
"-DHAVE_HID", "-DHAVE_HID",
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_CAMERA", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_CORELOCATION", "-DHAVE_CORELOCATION",
"-DHAVE_RGUI", "-DHAVE_RGUI",
@ -668,7 +668,7 @@
"-DHAVE_NETPLAY", "-DHAVE_NETPLAY",
"-DHAVE_HID", "-DHAVE_HID",
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_CAMERA", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_CORELOCATION", "-DHAVE_CORELOCATION",
"-DHAVE_RGUI", "-DHAVE_RGUI",
@ -727,7 +727,7 @@
"-DHAVE_NETPLAY", "-DHAVE_NETPLAY",
"-DHAVE_HID", "-DHAVE_HID",
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_CAMERA", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_CORELOCATION", "-DHAVE_CORELOCATION",
"-DHAVE_RGUI", "-DHAVE_RGUI",
@ -788,7 +788,7 @@
"-DHAVE_NETPLAY", "-DHAVE_NETPLAY",
"-DHAVE_HID", "-DHAVE_HID",
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_CAMERA", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_CORELOCATION", "-DHAVE_CORELOCATION",
"-DHAVE_RGUI", "-DHAVE_RGUI",
@ -854,7 +854,7 @@
"-DHAVE_NETPLAY", "-DHAVE_NETPLAY",
"-DHAVE_HID", "-DHAVE_HID",
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_CAMERA", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_CORELOCATION", "-DHAVE_CORELOCATION",
"-DHAVE_RGUI", "-DHAVE_RGUI",
@ -893,7 +893,7 @@
"-DHAVE_NETPLAY", "-DHAVE_NETPLAY",
"-DHAVE_HID", "-DHAVE_HID",
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_CAMERA", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_CORELOCATION", "-DHAVE_CORELOCATION",
"-DHAVE_RGUI", "-DHAVE_RGUI",

2
camera/camera_driver.c
View File

@ -32,7 +32,7 @@ static const camera_driver_t *camera_drivers[] = {
&camera_android, &camera_android,
#endif #endif
#ifdef HAVE_AVFOUNDATION #ifdef HAVE_AVFOUNDATION
&camera_apple, &camera_avfoundation,
#endif #endif
&camera_null, &camera_null,
NULL, NULL,

2
camera/camera_driver.h
View File

@ -50,7 +50,7 @@ typedef struct camera_driver
extern camera_driver_t camera_v4l2; extern camera_driver_t camera_v4l2;
extern camera_driver_t camera_android; extern camera_driver_t camera_android;
extern camera_driver_t camera_rwebcam; extern camera_driver_t camera_rwebcam;
extern camera_driver_t camera_apple; extern camera_driver_t camera_avfoundation;
extern camera_driver_t camera_null; extern camera_driver_t camera_null;
/** /**