From 00cc4ca7aa823bd218a7d3ff74b93b2215c7cef4 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 10 Apr 2018 03:53:46 +0200
Subject: [PATCH] (samples) Gets close to linking now

---
 intl/msg_hash_us.c              | 5 ++++-
 msg_hash.c                      | 4 ++++
 samples/tasks/database/Makefile | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c
index 264b0a7860..f399039c77 100644
--- a/intl/msg_hash_us.c
+++ b/intl/msg_hash_us.c
@@ -22,9 +22,11 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../configuration.h"
 #include "../verbosity.h"
 
+#ifdef RARCH_INTERNAL
+#include "../configuration.h"
+
 int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
     settings_t *settings = config_get_ptr();
@@ -2029,6 +2031,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len)
 
     return 0;
 }
+#endif
 
 #ifdef HAVE_MENU
 static const char *menu_hash_to_str_us_label_enum(enum msg_hash_enums msg)
diff --git a/msg_hash.c b/msg_hash.c
index 37a871b222..afdc0c4d0f 100644
--- a/msg_hash.c
+++ b/msg_hash.c
@@ -31,6 +31,7 @@ static unsigned uint_user_language;
 
 int menu_hash_get_help_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
+#ifdef HAVE_MENU
    int ret = -1;
 
 #ifdef HAVE_LANGEXTRA
@@ -90,6 +91,9 @@ int menu_hash_get_help_enum(enum msg_hash_enums msg, char *s, size_t len)
       return ret;
 
    return menu_hash_get_help_us_enum(msg, s, len);
+#else
+   return 0;
+#endif
 }
 
 const char *msg_hash_to_str(enum msg_hash_enums msg)
diff --git a/samples/tasks/database/Makefile b/samples/tasks/database/Makefile
index b6c8f22d7f..3529195a0b 100644
--- a/samples/tasks/database/Makefile
+++ b/samples/tasks/database/Makefile
@@ -70,6 +70,8 @@ SOURCES_C := \
 	$(CORE_DIR)/database_info.c \
 	$(CORE_DIR)/core_info.c \
 	$(CORE_DIR)/file_path_str.c \
+	$(CORE_DIR)/msg_hash.c \
+	$(CORE_DIR)/intl/msg_hash_us.c \
 	$(CORE_DIR)/playlist.c \
 	$(CORE_DIR)/verbosity.c \
 	$(CORE_DIR)/libretro-db/bintree.c \
@@ -81,6 +83,7 @@ SOURCES_C := \
 	$(LIBRETRO_COMM_DIR)/file/config_file.c \
 	$(LIBRETRO_COMM_DIR)/file/file_path.c \
 	$(LIBRETRO_COMM_DIR)/file/retro_dirent.c \
+	$(LIBRETRO_COMM_DIR)/hash/rhash.c \
 	$(LIBRETRO_COMM_DIR)/compat/compat_fnmatch.c \
 	$(LIBRETRO_COMM_DIR)/compat/compat_posix_string.c \
 	$(LIBRETRO_COMM_DIR)/compat/compat_strcasestr.c \