ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move camera drivers to camera/drivers/

This commit is contained in:
twinaphex 2015-01-12 19:04:12 +01:00
parent 33cdd16c22
commit 444adb622f
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.common
View File

@ -142,7 +142,7 @@ OBJ += frontend/frontend.o \
audio/resamplers/nearest.o \ audio/resamplers/nearest.o \
audio/resamplers/cc_resampler.o \ audio/resamplers/cc_resampler.o \
location/nulllocation.o \ location/nulllocation.o \
camera/nullcamera.o \ camera/drivers/nullcamera.o \
gfx/drivers/nullgfx.o \ gfx/drivers/nullgfx.o \
audio/drivers/nullaudio.o \ audio/drivers/nullaudio.o \
input/drivers/nullinput.o \ input/drivers/nullinput.o \
@ -177,7 +177,7 @@ ifeq ($(HAVE_EMSCRIPTEN), 1)
OBJ += frontend/platform/platform_emscripten.o \ OBJ += frontend/platform/platform_emscripten.o \
input/drivers/rwebinput_input.o \ input/drivers/rwebinput_input.o \
audio/drivers/rwebaudio.o \ audio/drivers/rwebaudio.o \
camera/rwebcam.o camera/drivers/rwebcam.o
endif endif
# Audio # Audio
@ -601,7 +601,7 @@ endif
# Camera # Camera
ifeq ($(HAVE_V4L2),1) ifeq ($(HAVE_V4L2),1)
OBJ += camera/video4linux2.o OBJ += camera/drivers/video4linux2.o
DEFINES += -DHAVE_V4L2 DEFINES += -DHAVE_V4L2
endif endif

2
camera/android.c → camera/drivers/android.c
View File

@ -16,7 +16,7 @@
*/ */
#include <glsym/glsym.h> #include <glsym/glsym.h>
#include "../driver.h" #include "../../driver.h"
typedef struct android_camera typedef struct android_camera
{ {

2
camera/nullcamera.c → camera/drivers/nullcamera.c
View File

@ -13,7 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../driver.h" #include "../../driver.h"
static void *nullcamera_init(const char *device, uint64_t caps, static void *nullcamera_init(const char *device, uint64_t caps,
unsigned width, unsigned height) unsigned width, unsigned height)

4
camera/rwebcam.c → camera/drivers/rwebcam.c
View File

@ -13,8 +13,8 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../driver.h" #include "../../driver.h"
#include "../emscripten/RWebCam.h" #include "../../emscripten/RWebCam.h"
static void *rwebcam_init(const char *device, uint64_t caps, static void *rwebcam_init(const char *device, uint64_t caps,
unsigned width, unsigned height) unsigned width, unsigned height)

2
camera/video4linux2.c → camera/drivers/video4linux2.c
View File

@ -20,7 +20,7 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <stddef.h> #include <stddef.h>
#include "../performance.h" #include "../../performance.h"
#include <retro_miscellaneous.h> #include <retro_miscellaneous.h>
#include <gfx/scaler/scaler.h> #include <gfx/scaler/scaler.h>
#include <stdlib.h> #include <stdlib.h>

8
griffin/griffin.c
View File

@ -418,16 +418,16 @@ AUDIO RESAMPLER
CAMERA CAMERA
============================================================ */ ============================================================ */
#if defined(ANDROID) #if defined(ANDROID)
#include "../camera/android.c" #include "../camera/drivers/android.c"
#elif defined(EMSCRIPTEN) #elif defined(EMSCRIPTEN)
#include "../camera/rwebcam.c" #include "../camera/drivers/rwebcam.c"
#endif #endif
#ifdef HAVE_V4L2 #ifdef HAVE_V4L2
#include "../camera/video4linux2.c" #include "../camera/drivers/video4linux2.c"
#endif #endif
#include "../camera/nullcamera.c" #include "../camera/drivers/nullcamera.c"
/*============================================================ /*============================================================
LOCATION LOCATION