From e709fd1ac60eb9d853d8a4c2dcee6d31037841aa Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 27 Feb 2019 16:47:39 +0100 Subject: [PATCH] Merge driver.c and retroarch.c --- Makefile.common | 1 - driver.c | 588 ---------------------------------------------- driver.h | 7 - griffin/griffin.c | 1 - retroarch.c | 559 ++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 551 insertions(+), 605 deletions(-) delete mode 100644 driver.c diff --git a/Makefile.common b/Makefile.common index 142cfebe3d..18e8a0e02b 100644 --- a/Makefile.common +++ b/Makefile.common @@ -219,7 +219,6 @@ OBJ += frontend/frontend.o \ camera/camera_driver.o \ wifi/wifi_driver.o \ location/location_driver.o \ - driver.o \ configuration.o \ $(LIBRETRO_COMM_DIR)/dynamic/dylib.o \ dynamic.o \ diff --git a/driver.c b/driver.c deleted file mode 100644 index 660b48a6f8..0000000000 --- a/driver.c +++ /dev/null @@ -1,588 +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 -#include - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include