diff --git a/Makefile.common b/Makefile.common
index 96820aee4a..c1b1fffff4 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -153,7 +153,6 @@ ifeq ($(HAVE_DR_MP3), 1)
endif
OBJ += frontend/frontend_driver.o \
- frontend/drivers/platform_null.o \
retroarch.o \
msg_hash.o \
intl/msg_hash_us.o \
diff --git a/Makefile.ctr.salamander b/Makefile.ctr.salamander
index 44987e81d6..14fb2f276f 100644
--- a/Makefile.ctr.salamander
+++ b/Makefile.ctr.salamander
@@ -24,7 +24,6 @@ OBJ := ctr/ctr_system.o \
frontend/frontend_salamander.o \
frontend/frontend_driver.o \
frontend/drivers/platform_ctr.o \
- frontend/drivers/platform_null.o \
libretro-common/encodings/encoding_utf.o \
libretro-common/compat/compat_strcasestr.o \
libretro-common/compat/fopen_utf8.o \
diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander
index 63c42d36d6..419fcffbe7 100644
--- a/Makefile.ps3.salamander
+++ b/Makefile.ps3.salamander
@@ -45,7 +45,6 @@ PPU_CXXFLAGS := $(PPU_OPTIMIZE_LV) $(INCFLAGS) $(DEFINES)
PPU_SRCS = frontend/frontend_salamander.c \
frontend/frontend_driver.c \
frontend/drivers/platform_ps3.c \
- frontend/drivers/platform_null.c \
libretro-common/file/file_path.c \
libretro-common/lists/dir_list.c \
libretro-common/lists/string_list.c \
diff --git a/Makefile.psp1.salamander b/Makefile.psp1.salamander
index 7c08c5222c..98ae539786 100644
--- a/Makefile.psp1.salamander
+++ b/Makefile.psp1.salamander
@@ -35,7 +35,6 @@ PSP_EBOOT_PIC1 = pkg/psp1/PIC1.PNG
OBJS = frontend/frontend_salamander.o \
frontend/frontend_driver.o \
frontend/drivers/platform_psp.o \
- frontend/drivers/platform_null.o \
libretro-common/file/file_path.o \
libretro-common/string/stdstring.o \
libretro-common/lists/string_list.o \
diff --git a/Makefile.vita.salamander b/Makefile.vita.salamander
index 165e03f42e..8898d5bab9 100644
--- a/Makefile.vita.salamander
+++ b/Makefile.vita.salamander
@@ -35,7 +35,6 @@ CFLAGS += $(RARCH_DEFINES)
OBJS = frontend/frontend_salamander.o \
frontend/frontend_driver.o \
frontend/drivers/platform_psp.o \
- frontend/drivers/platform_null.o \
libretro-common/file/file_path.o \
libretro-common/string/stdstring.o \
libretro-common/lists/string_list.o \
diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander
index 8dc4e027c6..0fe78655da 100644
--- a/Makefile.wii.salamander
+++ b/Makefile.wii.salamander
@@ -55,7 +55,6 @@ OBJ = frontend/frontend_salamander.o \
frontend/frontend_driver.o \
frontend/drivers/platform_gx.o \
frontend/drivers/platform_wii.o \
- frontend/drivers/platform_null.o \
libretro-common/file/file_path.o \
libretro-common/hash/rhash.o \
libretro-common/string/stdstring.o \
diff --git a/Makefile.wiiu b/Makefile.wiiu
index 77c8d2bb64..2fb859375f 100644
--- a/Makefile.wiiu
+++ b/Makefile.wiiu
@@ -53,7 +53,6 @@ ifeq ($(SALAMANDER_BUILD),1)
OBJ += frontend/frontend_salamander.o
OBJ += frontend/frontend_driver.o
OBJ += frontend/drivers/platform_wiiu.o
- OBJ += frontend/drivers/platform_null.o
OBJ += libretro-common/encodings/encoding_utf.o
OBJ += libretro-common/compat/compat_strcasestr.o
OBJ += libretro-common/compat/fopen_utf8.o
diff --git a/frontend/drivers/platform_null.c b/frontend/drivers/platform_null.c
deleted file mode 100644
index 1954dd0a34..0000000000
--- a/frontend/drivers/platform_null.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* RetroArch - A frontend for libretro.
- * Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- * Copyright (C) 2011-2017 - Daniel De Matteis
- *
- * RetroArch is free software: you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software Found-
- * ation, either version 3 of the License, or (at your option) any later version.
- *
- * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- * * You should have received a copy of the GNU General Public License along with RetroArch.
- * If not, see .
- */
-
-#include
-
-#include "../frontend_driver.h"
-
-frontend_ctx_driver_t frontend_ctx_null = {
- NULL, /* environment_get */
- NULL, /* init */
- NULL, /* deinit */
- NULL, /* exitspawn */
- NULL, /* process_args */
- NULL, /* exec */
- NULL, /* set_fork */
- NULL, /* shutdown */
- NULL, /* get_name */
- NULL, /* get_os */
- NULL, /* get_rating */
- NULL, /* load_content */
- NULL, /* get_architecture */
- NULL, /* get_powerstate */
- NULL, /* parse_drive_list */
- NULL, /* get_mem_total */
- NULL, /* get_mem_free */
- NULL, /* install_signal_handler */
- NULL, /* get_sighandler_state */
- NULL, /* set_sighandler_state */
- NULL, /* destroy_sighandler_state */
- NULL, /* attach_console */
- NULL, /* detach_console */
-#ifdef HAVE_LAKKA
- NULL, /* get_lakka_version */
-#endif
- NULL, /* watch_path_for_changes */
- NULL, /* check_for_path_changes */
- NULL, /* set_sustained_performance_mode */
- NULL, /* get_cpu_model_name */
- NULL, /* get_user_language */
- "null",
-};
diff --git a/frontend/frontend_driver.c b/frontend/frontend_driver.c
index 1c859a9a2e..8b8c68c845 100644
--- a/frontend/frontend_driver.c
+++ b/frontend/frontend_driver.c
@@ -36,6 +36,41 @@
#endif
#endif
+static frontend_ctx_driver_t frontend_ctx_null = {
+ NULL, /* environment_get */
+ NULL, /* init */
+ NULL, /* deinit */
+ NULL, /* exitspawn */
+ NULL, /* process_args */
+ NULL, /* exec */
+ NULL, /* set_fork */
+ NULL, /* shutdown */
+ NULL, /* get_name */
+ NULL, /* get_os */
+ NULL, /* get_rating */
+ NULL, /* load_content */
+ NULL, /* get_architecture */
+ NULL, /* get_powerstate */
+ NULL, /* parse_drive_list */
+ NULL, /* get_mem_total */
+ NULL, /* get_mem_free */
+ NULL, /* install_signal_handler */
+ NULL, /* get_sighandler_state */
+ NULL, /* set_sighandler_state */
+ NULL, /* destroy_sighandler_state */
+ NULL, /* attach_console */
+ NULL, /* detach_console */
+#ifdef HAVE_LAKKA
+ NULL, /* get_lakka_version */
+#endif
+ NULL, /* watch_path_for_changes */
+ NULL, /* check_for_path_changes */
+ NULL, /* set_sustained_performance_mode */
+ NULL, /* get_cpu_model_name */
+ NULL, /* get_user_language */
+ "null",
+};
+
static frontend_ctx_driver_t *frontend_ctx_drivers[] = {
#if defined(EMSCRIPTEN)
&frontend_ctx_emscripten,
diff --git a/frontend/frontend_driver.h b/frontend/frontend_driver.h
index fee9d8ebf1..2fcab26516 100644
--- a/frontend/frontend_driver.h
+++ b/frontend/frontend_driver.h
@@ -134,7 +134,6 @@ extern frontend_ctx_driver_t frontend_ctx_emscripten;
extern frontend_ctx_driver_t frontend_ctx_dos;
extern frontend_ctx_driver_t frontend_ctx_switch;
extern frontend_ctx_driver_t frontend_ctx_orbis;
-extern frontend_ctx_driver_t frontend_ctx_null;
/**
* frontend_ctx_find_driver:
diff --git a/griffin/griffin.c b/griffin/griffin.c
index da521a8951..64d9f04f8f 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -1070,7 +1070,6 @@ FRONTEND
#elif defined(DJGPP)
#include "../frontend/drivers/platform_dos.c"
#endif
-#include "../frontend/drivers/platform_null.c"
#include "../core_info.c"
diff --git a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj
index e316201b81..2f44f0dca5 100644
--- a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj
@@ -273,7 +273,6 @@
05A8C59420DB72F000FF7857 /* msg_hash_chs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = msg_hash_chs.h; sourceTree = ""; };
05A8C59620DB72F000FF7857 /* frontend.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = frontend.c; sourceTree = ""; };
05A8C59B20DB72F000FF7857 /* platform_darwin.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = platform_darwin.m; sourceTree = ""; };
- 05A8C59E20DB72F000FF7857 /* platform_null.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = platform_null.c; sourceTree = ""; };
05A8C5A920DB72F000FF7857 /* frontend_driver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = frontend_driver.h; sourceTree = ""; };
05A8C5AA20DB72F000FF7857 /* frontend.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = frontend.h; sourceTree = ""; };
05A8C5AB20DB72F000FF7857 /* frontend_driver.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = frontend_driver.c; sourceTree = ""; };
@@ -927,7 +926,6 @@
isa = PBXGroup;
children = (
05A8C59B20DB72F000FF7857 /* platform_darwin.m */,
- 05A8C59E20DB72F000FF7857 /* platform_null.c */,
);
path = drivers;
sourceTree = "";
diff --git a/pkg/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj b/pkg/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj
index eaa5cb7a2f..3503eea80d 100644
--- a/pkg/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj
+++ b/pkg/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj
@@ -366,14 +366,6 @@
CompileAsC
CompileAsC
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
CompileAsC
CompileAsC
@@ -426,4 +418,4 @@
-
\ No newline at end of file
+
diff --git a/pkg/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj.filters b/pkg/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj.filters
index b924ed2c19..b9a9ee51de 100644
--- a/pkg/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj.filters
+++ b/pkg/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj.filters
@@ -44,9 +44,6 @@
Source Files
-
- Source Files
-
Source Files
@@ -96,4 +93,4 @@
Source Files
-
\ No newline at end of file
+
diff --git a/pkg/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj b/pkg/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj
index 1b7c3d09f8..fddffc630b 100644
--- a/pkg/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj
+++ b/pkg/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj
@@ -287,9 +287,6 @@
-
-