rename config.c/h
authornotaz <notasas@gmail.com>
Mon, 24 Jun 2013 15:43:56 +0000 (18:43 +0300)
committernotaz <notasas@gmail.com>
Wed, 26 Jun 2013 00:07:08 +0000 (03:07 +0300)
Makefile
platform/common/config_file.c [moved from platform/common/config.c with 99% similarity]
platform/common/config_file.h [moved from platform/common/config.h with 100% similarity]
platform/common/emu.c
platform/common/main.c

index 32d4b59..f0fdc5a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ OBJS += platform/linux/emu.o platform/linux/blit.o \
 
 # common
 OBJS += platform/common/main.o platform/common/emu.o platform/common/menu_pico.o \
-       platform/common/config.o platform/common/plat_sdl.o \
+       platform/common/config_file.o platform/common/plat_sdl.o \
        platform/common/mp3_dummy.o
 
 # libpicofe
similarity index 99%
rename from platform/common/config.c
rename to platform/common/config_file.c
index 3ef1387..956ba4a 100644 (file)
@@ -16,7 +16,7 @@
 #include "../libpicofe/input.h"
 #include "../libpicofe/plat.h"
 #include "../libpicofe/lprintf.h"
-#include "config.h"
+#include "config_file.h"
 
 static char *mystrip(char *str);
 
index e0c50af..36539c6 100644 (file)
@@ -22,7 +22,7 @@
 #include "emu.h"\r
 #include "input_pico.h"\r
 #include "menu_pico.h"\r
-#include "config.h"\r
+#include "config_file.h"\r
 \r
 #include <pico/pico_int.h>\r
 #include <pico/patch.h>\r
index 968da0d..b9c4bd2 100644 (file)
@@ -15,7 +15,7 @@
 #include "../libpicofe/plat.h"\r
 #include "menu_pico.h"\r
 #include "emu.h"\r
-#include "config.h"\r
+//#include "config.h"\r
 #include <cpu/debug.h>\r
 #include <version.h>\r
 \r