Merge remote-tracking branch 'upstream/master' into pcenginetarget

samples/hello.c

@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <conio.h>
-#include <dbg.h>
+#include <joystick.h>
 
 
 
@@ -68,15 +68,23 @@ int main (void)
     gotoxy ((XSize - strlen (Text)) / 2, YSize / 2);
     cprintf ("%s", Text);
 
+#if defined(__NES__)
+
+    /* Wait for the user to press a button */
+    joy_install (joy_static_stddrv);
+    while (!joy_read (JOY_1)) ;
+    joy_uninstall ();
+
+#else
+
     /* Wait for the user to press a key */
     (void) cgetc ();
 
+#endif
+
     /* Clear the screen again */
     clrscr ();
 
     /* Done */
     return EXIT_SUCCESS;
 }
-
-
-