Fix grub-emu compilation

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index bbc564c8032065c63405bd3728d2415da3d05672..85ff972abf0d935fd7d3a35c2c28d7fbf9c7333e 100644 (file)
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -28,6 +28,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c   \
        normal/completion.c normal/main.c normal/color.c                \
        normal/menu.c normal/menu_entry.c normal/menu_viewer.c          \
        normal/menu_text.c normal/crypto.c normal/term.c                \
+       commands/terminal.c lib/charset.c \
        script/main.c script/execute.c script/function.c                \
        script/lexer.c script/script.c grub_script.tab.c                \
        partmap/amiga.c partmap/apple.c partmap/msdos.c partmap/sun.c   \

diff --git a/util/console.c b/util/console.c
index 40ee3a638b93a3bcc42a623e27b496e28ac45b2a..73195765e4a8ef9b8acb56f0d66bcc3ddfee6165 100644 (file)
--- a/util/console.c
+++ b/util/console.c
@@ -19,14 +19,6 @@
 
 #include <config.h>
 
-#if defined(HAVE_NCURSES_CURSES_H)
-# include <ncurses/curses.h>
-#elif defined(HAVE_NCURSES_H)
-# include <ncurses.h>
-#elif defined(HAVE_CURSES_H)
-# include <curses.h>
-#endif
-
 /* For compatibility.  */
 #ifndef A_NORMAL
 # define A_NORMAL      0
@@ -39,6 +31,14 @@
 #include <grub/term.h>
 #include <grub/types.h>
 
+#if defined(HAVE_NCURSES_CURSES_H)
+# include <ncurses/curses.h>
+#elif defined(HAVE_NCURSES_H)
+# include <ncurses.h>
+#elif defined(HAVE_CURSES_H)
+# include <curses.h>
+#endif
+
 static int grub_console_attr = A_NORMAL;
 
 grub_uint8_t grub_console_cur_color = 7;