From 8f798d564d0d23bee31ab2dfa177cfcc3455f930 Mon Sep 17 00:00:00 2001
From: shinydoofy <shinydoofy@users.sf.net>
Date: Thu, 18 Dec 2008 22:09:43 +0000
Subject: [PATCH] fixed major SDL compiling errors due to r1037 and re-added
 newline at EOF for ines.h - win32devs, please check for unusual behaviour
 this may have caused

---
 changelog.txt                |  1 +
 src/boards/SConscript        | 29 ++++++++++++++++++++++++++++-
 src/boards/copyfami_mmc3.cpp |  2 +-
 src/boards/sheroes.cpp       |  2 +-
 src/boards/super24.cpp       |  2 +-
 src/ines.h                   |  2 +-
 src/mappers/SConscript       |  7 -------
 7 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 0fb73e43..b12b53e7 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,5 @@
 ---version 2.0.4 yet to be released---
+18-dec-2008 - shinydoofy - sdl - fixed compiling errors for SDL due to r1037
 18-dec-2008 - adelikat - win32 - fullscreen mode fixed (both enters and returns to fullscreen just fine)
 16-dec-2008 - adelikat - win32 - debugger - added "Restore original window size" button
 16-dec-2008 - adelikat - win32 - debugger - fixed SF2073113 - Debugger now has a minimum valid size
diff --git a/src/boards/SConscript b/src/boards/SConscript
index a9a53411..f0f58941 100644
--- a/src/boards/SConscript
+++ b/src/boards/SConscript
@@ -1,8 +1,17 @@
 my_list =  Split("""
 01-222.cpp
+103.cpp
+106.cpp
+108.cpp
 112.cpp
 117.cpp
+120.cpp
+121.cpp
+15.cpp
 164.cpp
+177.cpp
+178.cpp
+179.cpp
 183.cpp
 185.cpp
 186.cpp
@@ -11,47 +20,65 @@ my_list =  Split("""
 199.cpp
 208.cpp
 222.cpp
+23.cpp
 235.cpp
+3d-block.cpp
+411120-c.cpp
 43.cpp
 57.cpp
 603-5052.cpp
+68.cpp
 8157.cpp
 8237.cpp
+830118C.cpp
 88.cpp
 90.cpp
 95.cpp
 a9711.cpp
+a9746.cpp
 addrlatch.cpp
+ax5705.cpp
+bandai.cpp
 bmc13in1jy110.cpp
 bmc42in1r.cpp
 bmc64in1nr.cpp
 bmc70in1.cpp
 bonza.cpp
+bs-5.cpp
+copyfami_mmc3.cpp
 datalatch.cpp
 deirom.cpp
 dream.cpp
 __dummy_mapper.cpp
 edu2000.cpp
 fk23c.cpp
+ghostbusters63in1.cpp
+gs-2004.cpp
+gs-2013.cpp
 h2288.cpp
 karaoke.cpp
 kof97.cpp
 konami-qtai.cpp
+ks7032.cpp
 malee.cpp
 mmc1.cpp
 mmc3.cpp
 mmc5.cpp
-n106.cpp
 n-c22m.cpp
+n106.cpp
+n625092.cpp
 novel.cpp
 sachen.cpp
 sheroes.cpp
 sl1632.cpp
+smb2j.cpp
 subor.cpp
 super24.cpp
 supervision.cpp
+t-227-1.cpp
 t-262.cpp
 tengen.cpp
+tf-1201.cpp
 """)
 
 for x in range(len(my_list)):
diff --git a/src/boards/copyfami_mmc3.cpp b/src/boards/copyfami_mmc3.cpp
index 0f23c4dc..871c9daa 100644
--- a/src/boards/copyfami_mmc3.cpp
+++ b/src/boards/copyfami_mmc3.cpp
@@ -45,7 +45,7 @@ D6-D0 - Small Page High Address (D6,D5,D4,D3,D2,D1,D0,A11,A10,A9,A8,A7,A6,A5,A4,
 
 static uint8 reg[3];
 
-static uint8 *CHRRAM=NULL;
+//static uint8 *CHRRAM=NULL;
 static uint32 CHRRAMSIZE;
 
 static SFORMAT StateRegs[]=
diff --git a/src/boards/sheroes.cpp b/src/boards/sheroes.cpp
index 3b4a1b36..49f349eb 100644
--- a/src/boards/sheroes.cpp
+++ b/src/boards/sheroes.cpp
@@ -21,7 +21,7 @@
 #include "mapinc.h"
 #include "mmc3.h"
 
-static uint8 *CHRRAM;
+//static uint8 *CHRRAM;
 static uint8 tekker;
 
 static void MSHCW(uint32 A, uint8 V)
diff --git a/src/boards/super24.cpp b/src/boards/super24.cpp
index 745e723e..205c8d2c 100644
--- a/src/boards/super24.cpp
+++ b/src/boards/super24.cpp
@@ -21,7 +21,7 @@
 #include "mapinc.h"
 #include "mmc3.h"
 
-static uint8 *CHRRAM = NULL;
+//static uint8 *CHRRAM = NULL;
 static int masko8[8]={63,31,15,1,3,0,0,0};
 
 static void Super24PW(uint32 A, uint8 V)
diff --git a/src/ines.h b/src/ines.h
index fe8e98e8..793d488c 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -452,4 +452,4 @@ void Mapper249_Init(CartInfo *);
 void Mapper250_Init(CartInfo *);
 void Mapper254_Init(CartInfo *);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/mappers/SConscript b/src/mappers/SConscript
index 371ecc08..6da16380 100644
--- a/src/mappers/SConscript
+++ b/src/mappers/SConscript
@@ -1,11 +1,9 @@
 my_list =   Split("""
 151.cpp
-15.cpp
 16.cpp
 17.cpp
 18.cpp
 193.cpp
-200.cpp
 201.cpp
 202.cpp
 203.cpp
@@ -17,7 +15,6 @@ my_list =   Split("""
 217.cpp
 21.cpp
 225.cpp
-__226.cpp
 227.cpp
 228.cpp
 229.cpp
@@ -26,8 +23,6 @@ __226.cpp
 231.cpp
 232.cpp
 234.cpp
-23.cpp
-240.cpp
 241.cpp
 242.cpp
 244.cpp
@@ -41,7 +36,6 @@ __226.cpp
 40.cpp
 41.cpp
 42.cpp
-43.cpp
 46.cpp
 50.cpp
 51.cpp
@@ -51,7 +45,6 @@ __226.cpp
 62.cpp
 65.cpp
 67.cpp
-68.cpp
 69.cpp
 6.cpp
 71.cpp