diff --git a/Makefile b/Makefile
index fe481ac50f..bc904b1cbe 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/Makefile.emscripten b/Makefile.emscripten
index 90cdb7a61e..baeabe535a 100644
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@@ -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)
diff --git a/Makefile.win b/Makefile.win
index 292442b1a9..d7e25c4101 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -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 \
diff --git a/audio/null.c b/audio/nullaudio.c
similarity index 100%
rename from audio/null.c
rename to audio/nullaudio.c
diff --git a/blackberry-qnx/bb10/.cproject b/blackberry-qnx/bb10/.cproject
index 329bbefc41..62e39c2a69 100644
--- a/blackberry-qnx/bb10/.cproject
+++ b/blackberry-qnx/bb10/.cproject
@@ -44,7 +44,6 @@
-
@@ -163,7 +162,6 @@
-
@@ -284,7 +282,6 @@
-
@@ -406,7 +403,6 @@
-
@@ -526,7 +522,6 @@
-
@@ -646,7 +641,6 @@
-
@@ -767,7 +761,6 @@
-
diff --git a/blackberry-qnx/cascades/RetroArch-Cascades.pro b/blackberry-qnx/cascades/RetroArch-Cascades.pro
index dec8fba502..052bfabb4f 100644
--- a/blackberry-qnx/cascades/RetroArch-Cascades.pro
+++ b/blackberry-qnx/cascades/RetroArch-Cascades.pro
@@ -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
diff --git a/blackberry-qnx/playbook/.cproject b/blackberry-qnx/playbook/.cproject
index 63f0d4d72e..8c18a217a7 100644
--- a/blackberry-qnx/playbook/.cproject
+++ b/blackberry-qnx/playbook/.cproject
@@ -45,7 +45,6 @@
-
@@ -169,7 +168,6 @@
-
@@ -295,7 +293,6 @@
-
@@ -416,7 +413,6 @@
-
diff --git a/driver.c b/driver.c
index 4fca98526d..352f563379 100644
--- a/driver.c
+++ b/driver.c
@@ -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,
};
diff --git a/gfx/null.c b/gfx/nullgfx.c
similarity index 100%
rename from gfx/null.c
rename to gfx/nullgfx.c
diff --git a/griffin/griffin.c b/griffin/griffin.c
index d7f8df4b60..e937a5946b 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -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
diff --git a/input/null.c b/input/nullinput.c
similarity index 99%
rename from input/null.c
rename to input/nullinput.c
index fb8ef2904e..27b546c6c9 100644
--- a/input/null.c
+++ b/input/nullinput.c
@@ -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",
};
diff --git a/location/null.c b/location/nulllocation.c
similarity index 100%
rename from location/null.c
rename to location/nulllocation.c
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
index d1d0df7b44..7c27a19d53 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
@@ -319,10 +319,16 @@
-
+
+
+
+
+
+
+
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
index 08272288bf..6be009f44b 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
@@ -22,8 +22,11 @@
-
+
+
+
+