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

2015-07-11 13:05:26 +02:00
parent 1365afa845 50b0536222
commit 877fd532c2
112 changed files with 3314 additions and 940 deletions
--- a/include/conio.h
+++ b/include/conio.h
@@ -77,6 +77,8 @@
 #  include <lynx.h>
 #elif defined(__NES__)
 #  include <nes.h>
+#elif defined(__OSIC1P__)
+#  include <osic1p.h>
 #elif defined(__PCE__)
 #  include <pce.h>
 #endif