From b7dfdd07e44895425ca218a0516eb49cea18cd6c Mon Sep 17 00:00:00 2001 From: punkrockguy318 Date: Thu, 25 Oct 2012 22:49:23 +0000 Subject: [PATCH] sdl: fix build scripts for mapper merge --- src/ines.cpp | 30 +++++++++++++-------------- src/mappers/SConscript | 47 +++++++++--------------------------------- src/unif.cpp | 40 +++++++++++++++++------------------ 3 files changed, 45 insertions(+), 72 deletions(-) diff --git a/src/ines.cpp b/src/ines.cpp index 39b54517..04d681f9 100644 --- a/src/ines.cpp +++ b/src/ines.cpp @@ -541,8 +541,8 @@ static BMAPPINGLocal bmap[] = { // {"", 14, Mapper14_Init}, {"100-in-1", 15, Mapper15_Init}, {"Bandai", 16, Mapper16_Init}, - {"", 17, Mapper17_Init}, - {"", 18, Mapper18_Init}, +// {"", 17, Mapper17_Init}, +// {"", 18, Mapper18_Init}, {"Namcot 106", 19, Mapper19_Init}, // {"", 20, Mapper20_Init}, // {"", 21, Mapper21_Init}, @@ -558,7 +558,7 @@ static BMAPPINGLocal bmap[] = { // {"", 31, Mapper31_Init}, // {"", 32, Mapper32_Init}, // {"", 33, Mapper33_Init}, - {"", 34, Mapper34_Init}, +// {"", 34, Mapper34_Init}, {"Wario Land 2", 35, UNLSC127_Init}, // Wario Land 2 {"TXC Policeman", 36, Mapper36_Init}, // TXC Policeman {"", 37, Mapper37_Init}, @@ -606,8 +606,8 @@ static BMAPPINGLocal bmap[] = { // {"", 79, Mapper79_Init}, // {"", 80, Mapper80_Init}, // {"", 81, Mapper81_Init}, - {"", 82, Mapper82_Init}, - {"", 83, Mapper83_Init}, +// {"", 82, Mapper82_Init}, +// {"", 83, Mapper83_Init}, // {"", 84, Mapper84_Init}, // {"", 85, Mapper85_Init}, {"", 86, Mapper86_Init}, @@ -615,15 +615,15 @@ static BMAPPINGLocal bmap[] = { {"", 88, Mapper88_Init}, {"", 89, Mapper89_Init}, {"", 90, Mapper90_Init}, - {"", 91, Mapper91_Init}, +// {"", 91, Mapper91_Init}, {"", 92, Mapper92_Init}, {"Sunsoft UNROM", 93, SUNSOFT_UNROM_Init}, {"", 94, Mapper94_Init}, {"", 95, Mapper95_Init}, - {"", 96, Mapper96_Init}, +// {"", 96, Mapper96_Init}, {"", 97, Mapper97_Init}, // {"", 98, Mapper98_Init}, - {"", 99, Mapper99_Init}, +// {"", 99, Mapper99_Init}, // {"", 100, Mapper100_Init}, {"", 101, Mapper101_Init}, // {"", 102, Mapper102_Init}, @@ -649,7 +649,7 @@ static BMAPPINGLocal bmap[] = { // {"", 122, Mapper122_Init}, {"UNLH2288", 123, UNLH2288_Init}, // {"", 124, Mapper124_Init}, - {"", 125, LH32_Init}, +// {"", 125, LH32_Init}, // {"", 126, Mapper126_Init}, // {"", 127, Mapper127_Init}, // {"", 128, Mapper128_Init}, @@ -675,12 +675,12 @@ static BMAPPINGLocal bmap[] = { {"SA0037", 148, SA0037_Init}, {"SA0036", 149, SA0036_Init}, {"S74LS374N", 150, S74LS374N_Init}, - {"", 151, Mapper151_Init}, +// {"", 151, Mapper151_Init}, {"", 152, Mapper152_Init}, {"", 153, Mapper153_Init}, {"", 154, Mapper154_Init}, {"", 155, Mapper155_Init}, - {"", 156, Mapper156_Init}, +// {"", 156, Mapper156_Init}, {"", 157, Mapper157_Init}, // {"", 158, Mapper158_Init}, // {"", 159, Mapper159_Init}, @@ -692,9 +692,9 @@ static BMAPPINGLocal bmap[] = { {"", 165, Mapper165_Init}, // {"", 166, Mapper166_Init}, // {"", 167, Mapper167_Init}, - {"", 168, Mapper168_Init}, +// {"", 168, Mapper168_Init}, // {"", 169, Mapper169_Init}, - {"", 170, Mapper170_Init}, +// {"", 170, Mapper170_Init}, {"", 171, Mapper171_Init}, {"", 172, Mapper172_Init}, {"", 173, Mapper173_Init}, @@ -717,7 +717,7 @@ static BMAPPINGLocal bmap[] = { // {"", 190, Mapper190_Init}, {"", 191, Mapper191_Init}, {"", 192, Mapper192_Init}, - {"", 193, Mapper193_Init}, +// {"", 193, Mapper193_Init}, {"", 194, Mapper194_Init}, {"", 195, Mapper195_Init}, {"", 196, Mapper196_Init}, @@ -749,7 +749,7 @@ static BMAPPINGLocal bmap[] = { {"", 222, Mapper222_Init}, // {"", 223, Mapper223_Init}, // {"", 224, Mapper224_Init}, - {"", 225, Mapper225_Init}, +// {"", 225, Mapper225_Init}, {"", 226, Mapper226_Init}, {"", 227, Mapper227_Init}, // {"", 228, Mapper228_Init}, diff --git a/src/mappers/SConscript b/src/mappers/SConscript index b6c067ff..aa1c1e61 100644 --- a/src/mappers/SConscript +++ b/src/mappers/SConscript @@ -1,35 +1,15 @@ my_list = Split(""" -151.cpp -16.cpp -17.cpp -18.cpp -193.cpp -201.cpp -202.cpp -203.cpp -204.cpp -212.cpp -213.cpp -214.cpp -215.cpp -217.cpp 21.cpp -225.cpp -227.cpp -228.cpp -229.cpp 22.cpp +228.cpp 230.cpp -231.cpp 232.cpp 234.cpp -241.cpp -242.cpp 244.cpp 246.cpp 24and26.cpp -255.cpp 25.cpp +255.cpp 27.cpp 32.cpp 33.cpp @@ -39,14 +19,12 @@ my_list = Split(""" 46.cpp 50.cpp 51.cpp -59.cpp -60.cpp +6.cpp 61.cpp 62.cpp 65.cpp 67.cpp 69.cpp -6.cpp 71.cpp 72.cpp 73.cpp @@ -55,22 +33,17 @@ my_list = Split(""" 77.cpp 79.cpp 80.cpp -82.cpp -83.cpp 85.cpp -86.cpp -89.cpp -8.cpp -91.cpp -92.cpp -97.cpp -99.cpp emu2413.c mmc2and4.cpp -simple.cpp -156.cpp """) - +# +# vrc7tone.h +# +# emu2413.h +# mapinc.h +# +# emutypes.h for x in range(len(my_list)): my_list[x] = 'mappers/' + my_list[x] Return('my_list') diff --git a/src/unif.cpp b/src/unif.cpp index 243f4b99..6ce57af1 100644 --- a/src/unif.cpp +++ b/src/unif.cpp @@ -317,7 +317,7 @@ static int LoadCHR(FCEUFILE *fp) static BMAPPING bmap[] = { - { "12-IN-1",BMC12IN1_Init,0}, +// { "12-IN-1",BMC12IN1_Init,0}, { "13in1JY110", BMC13in1JY110_Init, 0}, { "190in1", BMC190in1_Init, 0}, { "22211", UNL22211_Init,0}, @@ -335,10 +335,10 @@ static BMAPPING bmap[] = { { "8237A", UNL8237A_Init,0}, { "830118C",BMC830118C_Init, 0}, { "A65AS", BMCA65AS_Init,0}, - { "AC08", AC08_Init,0}, +// { "AC08", AC08_Init,0}, { "ANROM", ANROM_Init,0}, { "AX5705", UNLAX5705_Init, 0}, - { "BB", UNLBB_Init,0}, +// { "BB", UNLBB_Init,0}, { "BS-5",BMCBS5_Init, 0}, { "CC-21", UNLCC21_Init,0}, { "CITYFIGHT", UNLCITYFIGHT_Init, 0}, @@ -346,7 +346,7 @@ static BMAPPING bmap[] = { { "CPROM", CPROM_Init,BMCFLAG_16KCHRR}, { "D1038", BMCD1038_Init, 0}, { "DANCE", UNLOneBus_Init,0}, // redundant - { "DANCE2000", UNLD2000_Init,0}, +// { "DANCE2000", UNLD2000_Init,0}, { "DREAMTECH01", DreamTech01_Init,0}, { "EDU2000", UNLEDU2000_Init,0}, { "EKROM", EKROM_Init,0}, @@ -364,18 +364,18 @@ static BMAPPING bmap[] = { { "HKROM", HKROM_Init,0}, { "KOF97", UNLKOF97_Init,0}, { "KONAMI-QTAI", Mapper190_Init,0}, - { "KS7012", UNLKS7012_Init, 0}, - { "KS7013B", UNLKS7013B_Init, 0}, - { "KS7017", UNLKS7017_Init, 0}, - { "KS7030", UNLKS7030_Init, 0}, - { "KS7031", UNLKS7031_Init, 0}, +// { "KS7012", UNLKS7012_Init, 0}, +// { "KS7013B", UNLKS7013B_Init, 0}, +// { "KS7017", UNLKS7017_Init, 0}, +// { "KS7030", UNLKS7030_Init, 0}, +// { "KS7031", UNLKS7031_Init, 0}, { "KS7032", UNLKS7032_Init, 0}, - { "KS7037", UNLKS7037_Init, 0}, +// { "KS7037", UNLKS7037_Init, 0}, { "KS7057", UNLKS7057_Init, 0}, - { "LE05", LE05_Init,0}, - { "LH10", LH10_Init,0}, - { "LH32", LH32_Init,0}, - { "LH53", LH53_Init,0}, +// { "LE05", LE05_Init,0}, +// { "LH10", LH10_Init,0}, +// { "LH32", LH32_Init,0}, +// { "LH53", LH53_Init,0}, { "MARIO1-MALEE2", MALEE_Init,0}, { "MHROM", MHROM_Init,0}, { "N625092", UNLN625092_Init,0}, @@ -386,7 +386,7 @@ static BMAPPING bmap[] = { { "NTD-03", BMCNTD03_Init,0}, { "NovelDiamond9999999in1", Novel_Init,0}, { "OneBus", UNLOneBus_Init,0}, - { "PEC-586",UNLPEC586Init,0}, +// { "PEC-586",UNLPEC586Init,0}, { "RROM", NROM_Init,0 }, { "RROM-128", NROM_Init,0 }, { "SA-002", TCU02_Init, 0}, @@ -396,7 +396,7 @@ static BMAPPING bmap[] = { { "SA-016-1M", SA0161M_Init,0}, { "SA-72007", SA72007_Init,0}, { "SA-72008", SA72008_Init,0}, - { "SA-9602B", SA9602B_Init, BMCFLAG_32KCHRR}, +// { "SA-9602B", SA9602B_Init, BMCFLAG_32KCHRR}, { "SA-NROM", TCA01_Init,0}, { "SAROM", SAROM_Init,0}, { "SBROM", SBROM_Init,0}, @@ -413,7 +413,7 @@ static BMAPPING bmap[] = { { "SMB2J", UNLSMB2J_Init, 0}, { "SNROM", SNROM_Init,0}, { "SOROM", SOROM_Init,0}, - { "SSS-NROM-256", SSSNROM_Init,0 }, +// { "SSS-NROM-256", SSSNROM_Init,0 }, { "SUNSOFT_UNROM", SUNSOFT_UNROM_Init,0}, { "Sachen-74LS374N", S74LS374N_Init,0}, { "Sachen-74LS374NA", S74LS374NA_Init,0}, //seems to be custom mapper @@ -442,11 +442,11 @@ static BMAPPING bmap[] = { { "TR1ROM", TFROM_Init,BMCFLAG_FORCE4}, { "TSROM", TSROM_Init,0}, { "TVROM", TLROM_Init,BMCFLAG_FORCE4}, - { "Transformer", Transformer_Init, 0}, +// { "Transformer", Transformer_Init, 0}, { "UNROM", UNROM_Init,0}, { "UOROM", UNROM_Init,0}, - { "VRC7", UNLVRC7_Init,0}, - { "YOKO", UNLYOKO_Init,0}, +// { "VRC7", UNLVRC7_Init,0}, +// { "YOKO", UNLYOKO_Init,0}, {0,0,0} };