Add null drivers

This commit is contained in:
twinaphex 2014-08-14 03:05:44 +02:00
parent e1a122843b
commit 88af50ab82
14 changed files with 32 additions and 39 deletions

View File

@ -44,8 +44,11 @@ OBJ = frontend/frontend.o \
audio/dsp_filter.o \
audio/sinc.o \
audio/cc_resampler.o \
location/null.o \
location/nulllocation.o \
camera/nullcamera.o \
gfx/nullgfx.o \
audio/nullaudio.o \
input/nullinput.o \
performance.o

View File

@ -20,6 +20,7 @@ OBJ = frontend/platform/platform_emscripten.o \
rewind.o \
movie.o \
gfx/gfx_common.o \
input/nullinput.o \
input/input_common.o \
input/rwebinput_input.o \
input/keyboard_line.o \
@ -48,12 +49,14 @@ OBJ = frontend/platform/platform_emscripten.o \
audio/resampler.o \
audio/sinc.o \
audio/cc_resampler.o \
audio/null.o \
audio/nullaudio.o \
performance.o \
core_info.o \
location/null.o \
location/nulllocation.o \
camera/nullcamera.o \
camera/rwebcam.o
camera/rwebcam.o \
gfx/nullgfx.o
HAVE_OPENGL = 1
HAVE_RGUI = 1
@ -73,7 +76,7 @@ endif
libretro = libretro_emscripten.bc
LIBS =
DEFINES = -DHAVE_NULLAUDIO -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER
DEFINES = -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER
LDFLAGS = -L. -s TOTAL_MEMORY=$(MEMORY) -s OUTLINING_LIMIT=50000 --js-library emscripten/library_rwebaudio.js --js-library emscripten/library_rwebinput.js --js-library emscripten/library_rwebcam.js --no-heap-copy
ifeq ($(HAVE_RGUI), 1)

View File

@ -49,8 +49,11 @@ OBJ = frontend/frontend.o \
audio/dsp_filter.o \
audio/sinc.o \
audio/cc_resampler.o \
location/null.o \
location/nulllocation.o \
camera/nullcamera.o \
gfx/nullgfx.o \
audio/nullaudio.o \
input/nullinput.o \
performance.o
JOBJ := conf/config_file.o \

View File

@ -44,7 +44,6 @@
<listOptionValue builtIn="false" value="HAVE_ZLIB"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES2"/>
<listOptionValue builtIn="false" value="HAVE_NULLINPUT"/>
<listOptionValue builtIn="false" value="HAVE_AL"/>
<listOptionValue builtIn="false" value="HAVE_THREADS"/>
<listOptionValue builtIn="false" value="HAVE_OVERLAY"/>
@ -163,7 +162,6 @@
<listOptionValue builtIn="false" value="HAVE_ZLIB"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES2"/>
<listOptionValue builtIn="false" value="HAVE_NULLINPUT"/>
<listOptionValue builtIn="false" value="HAVE_AL"/>
<listOptionValue builtIn="false" value="HAVE_THREADS"/>
<listOptionValue builtIn="false" value="HAVE_OVERLAY"/>
@ -284,7 +282,6 @@
<listOptionValue builtIn="false" value="HAVE_ZLIB"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES2"/>
<listOptionValue builtIn="false" value="HAVE_NULLINPUT"/>
<listOptionValue builtIn="false" value="HAVE_AL"/>
<listOptionValue builtIn="false" value="HAVE_THREADS"/>
<listOptionValue builtIn="false" value="HAVE_OVERLAY"/>
@ -406,7 +403,6 @@
<listOptionValue builtIn="false" value="HAVE_ZLIB"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES2"/>
<listOptionValue builtIn="false" value="HAVE_NULLINPUT"/>
<listOptionValue builtIn="false" value="HAVE_AL"/>
<listOptionValue builtIn="false" value="HAVE_THREADS"/>
<listOptionValue builtIn="false" value="HAVE_OVERLAY"/>
@ -526,7 +522,6 @@
<listOptionValue builtIn="false" value="HAVE_ZLIB"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES2"/>
<listOptionValue builtIn="false" value="HAVE_NULLINPUT"/>
<listOptionValue builtIn="false" value="HAVE_AL"/>
<listOptionValue builtIn="false" value="HAVE_THREADS"/>
<listOptionValue builtIn="false" value="HAVE_OVERLAY"/>
@ -646,7 +641,6 @@
<listOptionValue builtIn="false" value="HAVE_ZLIB"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES2"/>
<listOptionValue builtIn="false" value="HAVE_NULLINPUT"/>
<listOptionValue builtIn="false" value="HAVE_AL"/>
<listOptionValue builtIn="false" value="HAVE_THREADS"/>
<listOptionValue builtIn="false" value="HAVE_OVERLAY"/>
@ -767,7 +761,6 @@
<listOptionValue builtIn="false" value="HAVE_ZLIB"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES2"/>
<listOptionValue builtIn="false" value="HAVE_NULLINPUT"/>
<listOptionValue builtIn="false" value="HAVE_AL"/>
<listOptionValue builtIn="false" value="HAVE_THREADS"/>
<listOptionValue builtIn="false" value="HAVE_OVERLAY"/>

View File

@ -9,7 +9,7 @@ DEFINES += HAVE_RGUI HAVE_MENU RARCH_MOBILE \
SINC_LOWER_QUALITY RARCH_INTERNAL \
HAVE_FBO HAVE_GRIFFIN __LIBRETRO__ \
HAVE_DYNAMIC HAVE_ZLIB HAVE_OPENGLES \
HAVE_OPENGLES2 HAVE_NULLINPUT HAVE_BUILTIN_FILTERS \
HAVE_OPENGLES2 HAVE_BUILTIN_FILTERS \
HAVE_AL HAVE_THREADS WANT_MINIZ HAVE_OVERLAY HAVE_GLSL \
USING_GL20 HAVE_OPENGL __STDC_CONSTANT_MACROS HAVE_BB10

View File

@ -45,7 +45,6 @@
<listOptionValue builtIn="false" value="HAVE_ZLIB"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES2"/>
<listOptionValue builtIn="false" value="HAVE_NULLINPUT"/>
<listOptionValue builtIn="false" value="HAVE_AL"/>
<listOptionValue builtIn="false" value="HAVE_THREADS"/>
<listOptionValue builtIn="false" value="WANT_MINIZ"/>
@ -169,7 +168,6 @@
<listOptionValue builtIn="false" value="HAVE_ZLIB"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES2"/>
<listOptionValue builtIn="false" value="HAVE_NULLINPUT"/>
<listOptionValue builtIn="false" value="HAVE_AL"/>
<listOptionValue builtIn="false" value="HAVE_THREADS"/>
<listOptionValue builtIn="false" value="WANT_MINIZ"/>
@ -295,7 +293,6 @@
<listOptionValue builtIn="false" value="HAVE_ZLIB"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES2"/>
<listOptionValue builtIn="false" value="HAVE_NULLINPUT"/>
<listOptionValue builtIn="false" value="HAVE_AL"/>
<listOptionValue builtIn="false" value="HAVE_THREADS"/>
<listOptionValue builtIn="false" value="WANT_MINIZ"/>
@ -416,7 +413,6 @@
<listOptionValue builtIn="false" value="HAVE_ZLIB"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES"/>
<listOptionValue builtIn="false" value="HAVE_OPENGLES2"/>
<listOptionValue builtIn="false" value="HAVE_NULLINPUT"/>
<listOptionValue builtIn="false" value="HAVE_AL"/>
<listOptionValue builtIn="false" value="HAVE_THREADS"/>
<listOptionValue builtIn="false" value="WANT_MINIZ"/>

View File

@ -96,9 +96,7 @@ static const audio_driver_t *audio_drivers[] = {
#ifdef PSP
&audio_psp1,
#endif
#ifdef HAVE_NULLAUDIO
&audio_null,
#endif
NULL,
};
@ -133,15 +131,13 @@ static const video_driver_t *video_drivers[] = {
#ifdef HAVE_VG
&video_vg,
#endif
#ifdef HAVE_NULLVIDEO
&video_null,
#endif
#ifdef HAVE_OMAP
&video_omap,
#endif
#ifdef HAVE_EXYNOS
&video_exynos,
#endif
&video_null,
NULL,
};
@ -188,9 +184,7 @@ static const input_driver_t *input_drivers[] = {
#ifdef EMSCRIPTEN
&input_rwebinput,
#endif
#ifdef HAVE_NULLINPUT
&input_null,
#endif
NULL,
};

View File

@ -235,9 +235,7 @@ VIDEO DRIVER
#include "../xenon/xenon360_video.c"
#endif
#if defined(HAVE_NULLVIDEO)
#include "../gfx/null.c"
#endif
#include "../gfx/nullgfx.c"
/*============================================================
FONTS
@ -331,9 +329,7 @@ INPUT
#include "../input/x11_input.c"
#endif
#if defined(HAVE_NULLINPUT)
#include "../input/null.c"
#endif
#include "../input/nullinput.c"
/*============================================================
STATE TRACKER
@ -386,7 +382,7 @@ LOCATION
#include "../location/android.c"
#endif
#include "../location/null.c"
#include "../location/nulllocation.c"
/*============================================================
RSOUND
@ -441,9 +437,7 @@ AUDIO
#include "../audio/coreaudio.c"
#endif
#if defined(HAVE_NULLAUDIO)
#include "../audio/null.c"
#endif
#include "../audio/nullaudio.c"
/*============================================================
DRIVERS

View File

@ -71,10 +71,8 @@ const input_driver_t input_null = {
nullinput_input_state,
nullinput_input_key_pressed,
nullinput_input_free_input,
NULL,
nullinput_set_sensor_state,
NULL,
nullinput_get_capabilities,
NULL,
"null",
};

View File

@ -319,10 +319,16 @@
</ClCompile>
<ClCompile Include="..\..\retroarch.c">
</ClCompile>
<ClCompile Include="..\..\location\null.c">
<ClCompile Include="..\..\location\nulllocation.c">
</ClCompile>
<ClCompile Include="..\..\camera\nullcamera.c">
</ClCompile>
<ClCompile Include="..\..\gfx\nullgfx.c">
</ClCompile>
<ClCompile Include="..\..\audio\nullaudio.c">
</ClCompile>
<ClCompile Include="..\..\input\nullinput.c">
</ClCompile>
<ClCompile Include="..\..\rewind.c">
</ClCompile>
<ClCompile Include="..\..\screenshot.c">

View File

@ -22,8 +22,11 @@
<ClCompile Include="..\..\netplay.c" />
<ClCompile Include="..\..\patch.c" />
<ClCompile Include="..\..\retroarch.c" />
<ClCompile Include="..\..\location\null.c" />
<ClCompile Include="..\..\location\nulllocation.c" />
<ClCompile Include="..\..\camera\nullcamera.c" />
<ClCompile Include="..\..\gfx\nullgfx.c" />
<ClCompile Include="..\..\gfx\nullaudio.c" />
<ClCompile Include="..\..\gfx\nullinput.c" />
<ClCompile Include="..\..\rewind.c" />
<ClCompile Include="..\..\screenshot.c" />
<ClCompile Include="..\..\settings.c" />