Commited chaoscode's patch to fix re2 and mp1

disabled njoy on linux as it doesn't compile (need to talk to JP about the right fix)
added ugly hack to include the right SDL.h on linux


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2179 8ced0084-cf51-0410-be5f-012b33b47a6e

SConstruct

@@ -68,7 +68,7 @@ dirs = [
     'Source/Plugins/Plugin_DSP_LLE/Src',
     'Source/Plugins/Plugin_PadSimple/Src',
     'Source/Plugins/Plugin_PadSimpleEvnt/Src',
-    'Source/Plugins/Plugin_nJoy_SDL/Src',
+#    'Source/Plugins/Plugin_nJoy_SDL/Src',
     'Source/Plugins/Plugin_nJoy_Testing/Src',
     'Source/Plugins/Plugin_Wiimote/Src',
     'Source/Core/DolphinWX/Src',

Source/Core/Core/Src/HW/Memmap.cpp

@@ -784,6 +784,7 @@ u8 *GetPointer(const u32 _Address)
     case 0x11:
     case 0x12:
     case 0x13:
+	case 0x7B:
     case 0x90:
     case 0x91:
     case 0x92:
@@ -809,8 +810,9 @@ u8 *GetPointer(const u32 _Address)
 	case 0xCD:
 		_dbg_assert_msg_(MEMMAP, 0, "Memory", "GetPointer from IO Bridge doesnt work");
 		return NULL;
+	case 0xFF: break;
 	default:
-		if (!PanicYesNo("Tried to get pointer for unknown address %08x\n Continue?", _Address))
+		if (!PanicYesNo("unknown pointer address report this to the devs %08x\n Continue?", (_Address >> 24)))
 			Crash();
 		break;
 	}

Source/Core/InputCommon/Src/SDL.h

@@ -38,7 +38,11 @@
 #include <vector>
 #include <cmath>
 
+#ifdef _WIN32 // UGLY HACK FIXME PLEAAAAAAASE
 #include <SDL.h> // Externals
+#else
+#include <SDL/SDL.h> // Externals
+#endif
 
 #include "Common.h" // Common
 #include "ConsoleWindow.h" 
@@ -202,4 +206,4 @@ std::vector<int> Pad_Square_to_Circle(int _x, int _y, int _pad, CONTROLLER_MAPPI
 } // InputCommon
 
 
-#endif // _SDL_h
+#endif // _SDL_h