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

Author: Vincent-FK

Rules

@@ -4,7 +4,7 @@ include Version
 XZ_OBJS = xz/xz_crc32.o xz/xz_crc64.o xz/xz_dec_lzma2.o xz/xz_dec_stream.o xz/xz_dec_bcj.o
 
 OBJS = lcd.o refresh.o lcdc.o palette.o cpu.o mem.o rtc.o hw.o sound.o \
-	events.o keytable.o configfile.o \
+	events.o keytable.o configfile_fk.o \
 	loader.o save.o debug.o emu.o main.o \
 	rccmds.o rckeys.o rcvars.o rcfile.o exports.o \
 	split.o path.o inflate.o $(XZ_OBJS)

configfile.c configfile_fk.cconfigfile.c renamed to configfile_fk.c

@@ -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]))
 

configfile.h configfile_fk.hconfigfile.h renamed to configfile_fk.h

@@ -14,7 +14,7 @@
 #include "rc.h"
 #include "rtc.h"
 #include "sys.h"
-#include "configfile.h"
+#include "configfile_fk.h"
 #include "sound.h"
 #include "cpu.h"
 
@@ -32,7 +32,7 @@ char *quick_save_file = NULL;
 char *cfg_file_default = NULL;
 char *cfg_file_rom = NULL;
 char *cfg_file_default_name = "default_config";
-char *cfg_file_extension = "cfg";
+char *cfg_file_extension = "fkcfg";
 int mQuickSaveAndPoweroff=0;
 
 

emu.c

@@ -9,7 +9,7 @@
 #include "loader.h"
 #include "split.h"
 #include "sys.h"
-#include "configfile.h"
+#include "configfile_fk.h"
 
 
 /*

rccmds.c

@@ -18,7 +18,7 @@
 #include <SDL/SDL_ttf.h>
 
 #include "sys.h"
-#include "configfile.h"
+#include "configfile_fk.h"
 #include "fb.h"
 #include "input.h"
 #include "emu.h"

sys/sdl/sdl-menu.c

@@ -15,7 +15,7 @@
 #include <SDL/SDL_ttf.h>
 
 #include "sys.h"
-#include "configfile.h"
+#include "configfile_fk.h"
 #include "fb.h"
 #include "input.h"
 #include "rc.h"