renamed.

diff --git a/emulator/joypad/Makefile b/emulator/joypad/Makefile
index dbf0db3..37f8552 100644 (file)
--- a/emulator/joypad/Makefile
+++ b/emulator/joypad/Makefile
@@ -2,7 +2,7 @@
 BIN=libjoypad.a
 TEST_BIN=jp-driver
 
-OBJS=joypad.o
+OBJS=joypad-wnd.o
 
 DUMMY_OBJS=jp-driver.o
         

diff --git a/emulator/joypad/joypad.c b/emulator/joypad/joypad-wnd.c
similarity index 99%
rename from emulator/joypad/joypad.c
rename to emulator/joypad/joypad-wnd.c
index adec720..01fe4ca 100644 (file)
--- a/emulator/joypad/joypad.c
+++ b/emulator/joypad/joypad-wnd.c
@@ -235,7 +235,7 @@ int window_start(int argc, char** argv)
     return 0;
 }
 
-int init_jp(void) {
+int init_joypad_wnd(void) {
     //init thread
     g_thread_init (NULL);
     gdk_threads_init ();

diff --git a/emulator/joypad/jp-driver.c b/emulator/joypad/jp-driver.c
index b893dc6..efeee7b 100644 (file)
--- a/emulator/joypad/jp-driver.c
+++ b/emulator/joypad/jp-driver.c
@@ -8,7 +8,7 @@ int window_start(int argc, char** argv);
 int main(int argc, char** argv) {
     printf("jp-driver...\n");
 
-    init_jp();
+    init_joypad_wnd();
     window_start(argc, argv);
     
     return 0;