Merged 1341 and partially merged 1334

src/MMU.cpp

@@ -39,9 +39,14 @@
 #include "gfx3d.h"
 #include "rtc.h"
 #include "GPU_osd.h"
-#include "zero_private.h"
 #include "mc.h"
 
+#ifdef DO_ASSERT_UNALIGNED
+#define ASSERT_UNALIGNED(x) assert(x)
+#else
+#define ASSERT_UNALIGNED(x)
+#endif
+
 static void FASTCALL _MMU_ARM9_write08(u32 adr, u8 val);
 static void FASTCALL _MMU_ARM9_write16(u32 adr, u16 val);
 static void FASTCALL _MMU_ARM9_write32(u32 adr, u32 val);

src/Makefile.am

@@ -37,7 +37,7 @@ libdesmume_a_SOURCES = \
 	matrix.cpp matrix.h \
 	gfx3d.cpp gfx3d.h \
         thumb_instructions.cpp thumb_instructions.h types.h \
-	zero_private.h shaders.h \
+	shaders.h \
 	movie.cpp movie.h \
 	PACKED.h PACKED_END.h \
 	utils/ConvertUTF.c utils/ConvertUTF.h utils/guid.cpp utils/guid.h \

src/windows/AboutBox.cpp

@@ -42,7 +42,7 @@ const char	*team[TEAM] = { "Original author",
 							"Andres Delikat",
 							"Riccardo Magliocchetti",
 							"Max Tabachenko (CrazyMax/mtabachenko)",
-							"Zeromus",
+							"zeromus",
 							"Luigi__",
 							"adelikat",
 							"",