Backported NDS changes from 1.0.0 branch to trunk

svn-id: r44426

1 files changed, 10 insertions, 7 deletions

diff --git a/backends/platform/ds/arm9/source/portdefs.h b/backends/platform/ds/arm9/source/portdefs.h
index 560bd8ab4b..5472b711b8 100644
--- a/backends/platform/ds/arm9/source/portdefs.h
+++ b/backends/platform/ds/arm9/source/portdefs.h
@@ -55,19 +55,22 @@ typedef signed int s32;
 #define DISABLE_TEXT_CONSOLE
 #define DISABLE_COMMAND_LINE
 
+#define STREAM_AUDIO_FROM_DISK
+
+//#undef assert
+//#define assert(expr) consolePrintf("Asserted!")
+#define NO_DEBUG_MSGS
+
+
+// This is defined in dsmain.cpp
 #ifdef __cplusplus
 extern "C" {
 #endif
-int consolePrintf(const char* s, ...);
+void consolePrintf(const char *format, ...);
 #ifdef __cplusplus
 }
 #endif
 
-//#undef assert
-//#define assert(expr) consolePrintf("Asserted!")
-#define NO_DEBUG_MSGS
-
-#define consolePrintf iprintf
 
 #ifdef assert
 #undef assert
@@ -82,7 +85,7 @@ int consolePrintf(const char* s, ...);
 
 #define ITCM_DATA	__attribute__((section(".itcm")))
 
-// Since I can't change the engine at the moment (post lockdown) this define can go here.
+// FIXME: Since I can't change the engine at the moment (post lockdown) this define can go here.
 // This define changes the mouse-relative motion which doesn't make sense on a touch screen to
 // a more conventional form of input where the menus can be clicked on.
 #define LURE_CLICKABLE_MENUS