Fix last reds, database tool definitely needs rework.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26072 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 6 insertions, 4 deletions

diff --git a/firmware/target/hosted/sdl/button-sdl.h b/firmware/target/hosted/sdl/button-sdl.h
index 75a68c49bc..e61920cc04 100644
--- a/firmware/target/hosted/sdl/button-sdl.h
+++ b/firmware/target/hosted/sdl/button-sdl.h
@@ -27,6 +27,8 @@
 #include "config.h"
 
 bool button_hold(void);
+#undef button_init_device
 void button_init_device(void);
+int button_read_device(void);
 
 #endif /* __BUTTON_SDL_H__ */
diff --git a/tools/database/database.c b/tools/database/database.c
index 41e73ae4a3..0f9304eb0a 100644
--- a/tools/database/database.c
+++ b/tools/database/database.c
@@ -40,12 +40,12 @@ void mutex_unlock(struct mutex *m)
     (void)m;
 }   
 
-void thread_sdl_thread_lock(void *me)
+void sim_thread_lock(void *me)
 {
     (void)me;
 }   
 
-void * thread_sdl_thread_unlock(void)
+void * sim_thread_unlock(void)
 {
     return (void*)1;
 }   
diff --git a/tools/database/database.make b/tools/database/database.make
index 54913d8d4a..d5e10099ef 100644
--- a/tools/database/database.make
+++ b/tools/database/database.make
@@ -32,8 +32,8 @@ INCLUDES = -I$(ROOTDIR)/apps/gui \
            -I$(APPSDIR) \
            -I$(BUILDDIR) \
 
-SIMINCLUDES += -I$(ROOTDIR)/uisimulator/sdl -I$(ROOTDIR)/uisimulator/common \
-        -I$(FIRMDIR)/export $(TARGET_INC) -I$(BUILDDIR) -I$(APPSDIR)
+SIMINCLUDES += -I$(FIRMDIR)/target/hosted/sdl -I$(FIRMDIR)/target/hosted \
+        -I$(ROOTDIR)/uisimulator/common -I$(FIRMDIR)/export -I$(BUILDDIR) -I$(APPSDIR)
 
 # Makes mkdepfile happy
 GCCOPTS+=`$(SDLCONFIG) --cflags`