Merge branch 'FunKey' of fk:FunKey-Project/fceux into FunKey

Author: Vincent-FK

Makefile

@@ -207,7 +207,7 @@ GUI_OBJS = \
 	$(SRC)drivers/dingux-sdl/gui/file_list.o \
 	$(SRC)drivers/dingux-sdl/gui/font.o
 
-DRIVER_OBJS = $(SRC)drivers/dingux-sdl/config.o $(SRC)drivers/dingux-sdl/configfile.o \
+DRIVER_OBJS = $(SRC)drivers/dingux-sdl/config.o $(SRC)drivers/dingux-sdl/configfile_fk.o \
 	$(SRC)drivers/dingux-sdl/input.o \
 	$(SRC)drivers/dingux-sdl/dingoo.o $(SRC)drivers/dingux-sdl/dingoo-joystick.o \
 	$(SRC)drivers/dingux-sdl/dingoo-throttle.o $(SRC)drivers/dingux-sdl/dingoo-sound.o \

src/drivers/dingux-sdl/configfile.cpp src/drivers/dingux-sdl/configfile_fk.cppsrc/drivers/dingux-sdl/configfile.cpp renamed to src/drivers/dingux-sdl/configfile_fk.cpp

@@ -1,12 +1,12 @@
-// configfile.c - handles loading and saving the configuration options
+// configfile_fk.c - handles loading and saving the FunKey configuration options
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
 
-#include "configfile.h"
+#include "configfile_fk.h"
 
 #define ARRAY_LEN(arr) (sizeof(arr) / sizeof(arr[0]))
 

src/drivers/dingux-sdl/configfile.h src/drivers/dingux-sdl/configfile_fk.hsrc/drivers/dingux-sdl/configfile.h renamed to src/drivers/dingux-sdl/configfile_fk.h

@@ -33,7 +33,7 @@
 #include "dingoo-video.h"
 #include "scaler.h"
 #include "menu.h"
-#include "configfile.h"
+#include "configfile_fk.h"
 
 #include "../common/vidblit.h"
 #include "../../fceu.h"

src/drivers/dingux-sdl/dingoo-video.cpp

@@ -17,7 +17,7 @@
 #include "throttle.h"
 #include "config.h"
 #include "menu.h"
-#include "configfile.h"
+#include "configfile_fk.h"
 
 #include "../common/cheat.h"
 #include "../../fceu.h"
@@ -104,7 +104,7 @@ char *quick_save_file = NULL;
 char *cfg_file_default = NULL;
 char *cfg_file_rom = NULL;
 static char *cfg_file_default_name = "default_config";
-static char *cfg_file_extension = "cfg";
+static char *cfg_file_extension = "fkcfg";
 int mQuickSaveAndPoweroff=0;
 
 

src/drivers/dingux-sdl/dingoo.cpp

@@ -29,7 +29,7 @@
 #include "dingoo-video.h"
 #include "dingoo.h"
 #include "menu.h"
-#include "configfile.h"
+#include "configfile_fk.h"
 
 #include "gui/gui.h"
 

src/drivers/dingux-sdl/input.cpp

@@ -17,7 +17,7 @@
 #include "dface.h"
 
 #include "menu.h"
-#include "configfile.h"
+#include "configfile_fk.h"
 
 #include "../common/configSys.h"
 #include <SDL/SDL_ttf.h>