From 6ea032a1912aca8b00c03111db9b3f1f411d1e61 Mon Sep 17 00:00:00 2001 From: rogerman Date: Mon, 11 Nov 2013 20:46:03 +0000 Subject: [PATCH] Cocoa Port: - Integrate new SLOT-2 code with all projects. --- .../project.pbxproj | 52 ++++++++++++------- .../project.pbxproj | 40 +++++++++----- .../project.pbxproj | 28 ++++++---- .../project.pbxproj | 28 ++++++---- desmume/src/cocoa/cocoa_core.mm | 4 +- 5 files changed, 98 insertions(+), 54 deletions(-) diff --git a/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj b/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj index 61cbfb958..9ba7bf300 100644 --- a/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj +++ b/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj @@ -30,7 +30,6 @@ AB0191D614BD72EC004CB612 /* MainMenu (Legacy).xib in Resources */ = {isa = PBXBuildFile; fileRef = AB0191D214BD72EC004CB612 /* MainMenu (Legacy).xib */; }; AB06CCD6135B8AA200E977B3 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97324FDCFA39411CA2CEA /* AppKit.framework */; }; AB06CCD7135B8AA300E977B3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97325FDCFA39411CA2CEA /* Foundation.framework */; }; - AB06CD3D135B8ACE00E977B3 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD0E135B8ACE00E977B3 /* addons.cpp */; }; AB06CD3F135B8ACE00E977B3 /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD10135B8ACE00E977B3 /* arm_instructions.cpp */; }; AB06CD40135B8ACE00E977B3 /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD11135B8ACE00E977B3 /* armcpu.cpp */; }; AB06CD41135B8ACE00E977B3 /* bios.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD12135B8ACE00E977B3 /* bios.cpp */; }; @@ -66,7 +65,6 @@ AB06CD69135B8ACE00E977B3 /* thumb_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD3A135B8ACE00E977B3 /* thumb_instructions.cpp */; }; AB06CD6A135B8ACE00E977B3 /* version.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD3B135B8ACE00E977B3 /* version.cpp */; }; AB06CD6B135B8ACE00E977B3 /* wifi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD3C135B8ACE00E977B3 /* wifi.cpp */; }; - AB06CD6C135B8ACE00E977B3 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD0E135B8ACE00E977B3 /* addons.cpp */; }; AB06CD6D135B8ACE00E977B3 /* aggdraw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD0F135B8ACE00E977B3 /* aggdraw.cpp */; }; AB06CD6E135B8ACE00E977B3 /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD10135B8ACE00E977B3 /* arm_instructions.cpp */; }; AB06CD6F135B8ACE00E977B3 /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD11135B8ACE00E977B3 /* armcpu.cpp */; }; @@ -207,7 +205,6 @@ AB06CE96135B8AEE00E977B3 /* xstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CE11135B8AED00E977B3 /* xstring.cpp */; }; AB0A0D1E14AACACC00E83E91 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AB0A0D1D14AACACC00E83E91 /* libz.dylib */; }; AB0A0D3714AACE9500E83E91 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1F4B55090F53924500C8B514 /* Localizable.strings */; }; - AB0A0D4614AACE9500E83E91 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD0E135B8ACE00E977B3 /* addons.cpp */; }; AB0A0D4714AACE9500E83E91 /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD10135B8ACE00E977B3 /* arm_instructions.cpp */; }; AB0A0D4814AACE9500E83E91 /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD11135B8ACE00E977B3 /* armcpu.cpp */; }; AB0A0D4914AACE9500E83E91 /* bios.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD12135B8ACE00E977B3 /* bios.cpp */; }; @@ -361,7 +358,6 @@ AB1814D715D212B4007A6CC3 /* AppIcon_FirmwareConfig.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB7522E314C7D879009B97B3 /* AppIcon_FirmwareConfig.icns */; }; AB1814D915D212B4007A6CC3 /* ConvertUTF.c in Sources */ = {isa = PBXBuildFile; fileRef = AB06CDDD135B8AED00E977B3 /* ConvertUTF.c */; }; AB1814DA15D212B4007A6CC3 /* AAFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CDBB135B8AED00E977B3 /* AAFilter.cpp */; }; - AB1814DB15D212B4007A6CC3 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD0E135B8ACE00E977B3 /* addons.cpp */; }; AB1814DC15D212B4007A6CC3 /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD10135B8ACE00E977B3 /* arm_instructions.cpp */; }; AB1814DD15D212B4007A6CC3 /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD11135B8ACE00E977B3 /* armcpu.cpp */; }; AB1814DE15D212B4007A6CC3 /* bios.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD12135B8ACE00E977B3 /* bios.cpp */; }; @@ -491,7 +487,6 @@ AB18157315D21469007A6CC3 /* AppIcon_FirmwareConfig.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB7522E314C7D879009B97B3 /* AppIcon_FirmwareConfig.icns */; }; AB18157515D21469007A6CC3 /* ConvertUTF.c in Sources */ = {isa = PBXBuildFile; fileRef = AB06CDDD135B8AED00E977B3 /* ConvertUTF.c */; }; AB18157615D21469007A6CC3 /* AAFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CDBB135B8AED00E977B3 /* AAFilter.cpp */; }; - AB18157715D21469007A6CC3 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD0E135B8ACE00E977B3 /* addons.cpp */; }; AB18157815D21469007A6CC3 /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD10135B8ACE00E977B3 /* arm_instructions.cpp */; }; AB18157915D21469007A6CC3 /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD11135B8ACE00E977B3 /* armcpu.cpp */; }; AB18157A15D21469007A6CC3 /* bios.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD12135B8ACE00E977B3 /* bios.cpp */; }; @@ -621,7 +616,6 @@ AB18160F15D214F2007A6CC3 /* AppIcon_FirmwareConfig.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB7522E314C7D879009B97B3 /* AppIcon_FirmwareConfig.icns */; }; AB18161115D214F2007A6CC3 /* ConvertUTF.c in Sources */ = {isa = PBXBuildFile; fileRef = AB06CDDD135B8AED00E977B3 /* ConvertUTF.c */; }; AB18161215D214F2007A6CC3 /* AAFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CDBB135B8AED00E977B3 /* AAFilter.cpp */; }; - AB18161315D214F2007A6CC3 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD0E135B8ACE00E977B3 /* addons.cpp */; }; AB18161415D214F2007A6CC3 /* aggdraw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD0F135B8ACE00E977B3 /* aggdraw.cpp */; }; AB18161515D214F2007A6CC3 /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD10135B8ACE00E977B3 /* arm_instructions.cpp */; }; AB18161615D214F2007A6CC3 /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD11135B8ACE00E977B3 /* armcpu.cpp */; }; @@ -872,6 +866,20 @@ ABAC890A14B7943E001B299F /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = ABAC890814B7943E001B299F /* main.m */; }; ABAC890B14B7943E001B299F /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = ABAC890814B7943E001B299F /* main.m */; }; ABAC890C14B7943E001B299F /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = ABAC890814B7943E001B299F /* main.m */; }; + ABB328E718313F5A00FEE4C4 /* slot2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB328E618313F5A00FEE4C4 /* slot2.cpp */; }; + ABB328E818313F5A00FEE4C4 /* slot2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB328E618313F5A00FEE4C4 /* slot2.cpp */; }; + ABB328E918313F5A00FEE4C4 /* slot2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB328E618313F5A00FEE4C4 /* slot2.cpp */; }; + ABB328EA18313F5A00FEE4C4 /* slot2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB328E618313F5A00FEE4C4 /* slot2.cpp */; }; + ABB328EB18313F5A00FEE4C4 /* slot2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB328E618313F5A00FEE4C4 /* slot2.cpp */; }; + ABB328EC18313F5A00FEE4C4 /* slot2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB328E618313F5A00FEE4C4 /* slot2.cpp */; }; + ABB328ED18313F5A00FEE4C4 /* slot2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB328E618313F5A00FEE4C4 /* slot2.cpp */; }; + ABB328EF18313F7C00FEE4C4 /* slot2_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB328EE18313F7C00FEE4C4 /* slot2_auto.cpp */; }; + ABB328F018313F7C00FEE4C4 /* slot2_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB328EE18313F7C00FEE4C4 /* slot2_auto.cpp */; }; + ABB328F118313F7C00FEE4C4 /* slot2_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB328EE18313F7C00FEE4C4 /* slot2_auto.cpp */; }; + ABB328F218313F7C00FEE4C4 /* slot2_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB328EE18313F7C00FEE4C4 /* slot2_auto.cpp */; }; + ABB328F318313F7C00FEE4C4 /* slot2_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB328EE18313F7C00FEE4C4 /* slot2_auto.cpp */; }; + ABB328F418313F7C00FEE4C4 /* slot2_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB328EE18313F7C00FEE4C4 /* slot2_auto.cpp */; }; + ABB328F518313F7C00FEE4C4 /* slot2_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB328EE18313F7C00FEE4C4 /* slot2_auto.cpp */; }; ABB9215A17CEB53A0049D4C5 /* slot1comp_protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB9215917CEB53A0049D4C5 /* slot1comp_protocol.cpp */; }; ABB9215B17CEB53A0049D4C5 /* slot1comp_protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB9215917CEB53A0049D4C5 /* slot1comp_protocol.cpp */; }; ABB9215C17CEB53A0049D4C5 /* slot1comp_protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB9215917CEB53A0049D4C5 /* slot1comp_protocol.cpp */; }; @@ -1056,7 +1064,6 @@ ABF50C5B169F61540018C08D /* x86operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAB169F61540018C08D /* x86operand.cpp */; }; ABF50C5C169F61540018C08D /* x86util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAD169F61540018C08D /* x86util.cpp */; }; ABFE4242143E32F0009A3CCE /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1F4B55090F53924500C8B514 /* Localizable.strings */; }; - ABFE4251143E32F0009A3CCE /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD0E135B8ACE00E977B3 /* addons.cpp */; }; ABFE4252143E32F0009A3CCE /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD10135B8ACE00E977B3 /* arm_instructions.cpp */; }; ABFE4253143E32F0009A3CCE /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD11135B8ACE00E977B3 /* armcpu.cpp */; }; ABFE4254143E32F0009A3CCE /* bios.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD12135B8ACE00E977B3 /* bios.cpp */; }; @@ -1176,7 +1183,6 @@ AB0191E914BD7425004CB612 /* Romanian */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Romanian; path = "translations/Romanian.lproj/MainMenu (Legacy).xib"; sourceTree = ""; }; AB06CB49135B8A4D00E977B3 /* sndOSX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sndOSX.h; sourceTree = ""; }; AB06CCD5135B8A9B00E977B3 /* DeSmuME_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeSmuME_Prefix.pch; sourceTree = ""; }; - AB06CCD8135B8ACE00E977B3 /* addons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = addons.h; path = ../addons.h; sourceTree = SOURCE_ROOT; }; AB06CCD9135B8ACE00E977B3 /* agg2d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = agg2d.h; path = ../agg2d.h; sourceTree = SOURCE_ROOT; }; AB06CCDA135B8ACE00E977B3 /* aggdraw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aggdraw.h; path = ../aggdraw.h; sourceTree = SOURCE_ROOT; }; AB06CCDC135B8ACE00E977B3 /* armcpu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = armcpu.h; path = ../armcpu.h; sourceTree = SOURCE_ROOT; }; @@ -1227,7 +1233,6 @@ AB06CD0B135B8ACE00E977B3 /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = types.h; path = ../types.h; sourceTree = SOURCE_ROOT; }; AB06CD0C135B8ACE00E977B3 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = version.h; path = ../version.h; sourceTree = SOURCE_ROOT; }; AB06CD0D135B8ACE00E977B3 /* wifi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wifi.h; path = ../wifi.h; sourceTree = SOURCE_ROOT; }; - AB06CD0E135B8ACE00E977B3 /* addons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = addons.cpp; path = ../addons.cpp; sourceTree = SOURCE_ROOT; }; AB06CD0F135B8ACE00E977B3 /* aggdraw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = aggdraw.cpp; path = ../aggdraw.cpp; sourceTree = SOURCE_ROOT; }; AB06CD10135B8ACE00E977B3 /* arm_instructions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = arm_instructions.cpp; path = ../arm_instructions.cpp; sourceTree = SOURCE_ROOT; }; AB06CD11135B8ACE00E977B3 /* armcpu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = armcpu.cpp; path = ../armcpu.cpp; sourceTree = SOURCE_ROOT; }; @@ -1414,6 +1419,9 @@ AB8FE37514B652EC009E20B1 /* cocoa_util.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_util.mm; sourceTree = ""; }; AB97D29516964D01002AC11B /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; }; ABAC890814B7943E001B299F /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + ABB328E518313F5A00FEE4C4 /* slot2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = slot2.h; path = ../slot2.h; sourceTree = SOURCE_ROOT; }; + ABB328E618313F5A00FEE4C4 /* slot2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = slot2.cpp; path = ../slot2.cpp; sourceTree = SOURCE_ROOT; }; + ABB328EE18313F7C00FEE4C4 /* slot2_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot2_auto.cpp; sourceTree = ""; }; ABB9215817CEB53A0049D4C5 /* slot1comp_protocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slot1comp_protocol.h; sourceTree = ""; }; ABB9215917CEB53A0049D4C5 /* slot1comp_protocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1comp_protocol.cpp; sourceTree = ""; }; ABBF045E14B5144D00E505A0 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = "translations/English.lproj/MainMenu (Legacy).xib"; sourceTree = ""; }; @@ -1712,7 +1720,6 @@ AB06CDAF135B8AED00E977B3 /* gdbstub */, AB06CDB3135B8AED00E977B3 /* metaspu */, AB06CDDC135B8AED00E977B3 /* utils */, - AB06CD0E135B8ACE00E977B3 /* addons.cpp */, AB06CD0F135B8ACE00E977B3 /* aggdraw.cpp */, AB06CD10135B8ACE00E977B3 /* arm_instructions.cpp */, AB18136C15D1FB73007A6CC3 /* arm_jit.cpp */, @@ -1754,13 +1761,13 @@ AB06CD34135B8ACE00E977B3 /* rtc.cpp */, AB06CD35135B8ACE00E977B3 /* saves.cpp */, AB06CD36135B8ACE00E977B3 /* slot1.cpp */, + ABB328E618313F5A00FEE4C4 /* slot2.cpp */, AB06CD37135B8ACE00E977B3 /* sndsdl.cpp */, AB06CD38135B8ACE00E977B3 /* SPU.cpp */, AB06CD39135B8ACE00E977B3 /* texcache.cpp */, AB06CD3A135B8ACE00E977B3 /* thumb_instructions.cpp */, AB06CD3B135B8ACE00E977B3 /* version.cpp */, AB06CD3C135B8ACE00E977B3 /* wifi.cpp */, - AB06CCD8135B8ACE00E977B3 /* addons.h */, AB06CCD9135B8ACE00E977B3 /* agg2d.h */, AB06CCDA135B8ACE00E977B3 /* aggdraw.h */, AB18137115D1FB8F007A6CC3 /* arm_jit.h */, @@ -1809,6 +1816,7 @@ AB06CD03135B8ACE00E977B3 /* rtc.h */, AB06CD04135B8ACE00E977B3 /* saves.h */, AB06CD06135B8ACE00E977B3 /* slot1.h */, + ABB328E518313F5A00FEE4C4 /* slot2.h */, AB06CD07135B8ACE00E977B3 /* sndsdl.h */, AB06CD08135B8ACE00E977B3 /* SPU.h */, AB06CD09135B8ACE00E977B3 /* texcache.h */, @@ -1881,6 +1889,7 @@ AB4C80F117C5DA240024D479 /* slot1comp_mc.cpp */, ABB9215917CEB53A0049D4C5 /* slot1comp_protocol.cpp */, AB4C80F317C5DA240024D479 /* slot1comp_rom.cpp */, + ABB328EE18313F7C00FEE4C4 /* slot2_auto.cpp */, AB06CD9F135B8AED00E977B3 /* slot2_expMemory.cpp */, AB06CDA0135B8AED00E977B3 /* slot2_gbagame.cpp */, AB06CDA1135B8AED00E977B3 /* slot2_guitarGrip.cpp */, @@ -2822,7 +2831,6 @@ files = ( AB06CE80135B8AEE00E977B3 /* ConvertUTF.c in Sources */, AB06CE6C135B8AEE00E977B3 /* AAFilter.cpp in Sources */, - AB06CD6C135B8ACE00E977B3 /* addons.cpp in Sources */, AB06CD6D135B8ACE00E977B3 /* aggdraw.cpp in Sources */, AB06CD6E135B8ACE00E977B3 /* arm_instructions.cpp in Sources */, AB06CD6F135B8ACE00E977B3 /* armcpu.cpp in Sources */, @@ -2973,6 +2981,8 @@ AB4352B717D66187007417C8 /* fsnitro.cpp in Sources */, AB4352C317D661AC007417C8 /* slot1_retail_mcrom_debug.cpp in Sources */, AB126D2A182ECC7B00EBCF22 /* slot2_passme.cpp in Sources */, + ABB328EC18313F5A00FEE4C4 /* slot2.cpp in Sources */, + ABB328F418313F7C00FEE4C4 /* slot2_auto.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2982,7 +2992,6 @@ files = ( AB06CE3E135B8AEE00E977B3 /* ConvertUTF.c in Sources */, AB06CE2A135B8AEE00E977B3 /* AAFilter.cpp in Sources */, - AB06CD3D135B8ACE00E977B3 /* addons.cpp in Sources */, AB06CD3F135B8ACE00E977B3 /* arm_instructions.cpp in Sources */, AB06CD40135B8ACE00E977B3 /* armcpu.cpp in Sources */, AB06CD41135B8ACE00E977B3 /* bios.cpp in Sources */, @@ -3123,6 +3132,8 @@ AB4352BA17D66187007417C8 /* fsnitro.cpp in Sources */, AB4352C617D661AC007417C8 /* slot1_retail_mcrom_debug.cpp in Sources */, AB126D28182ECC7B00EBCF22 /* slot2_passme.cpp in Sources */, + ABB328EA18313F5A00FEE4C4 /* slot2.cpp in Sources */, + ABB328F218313F7C00FEE4C4 /* slot2_auto.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3132,7 +3143,6 @@ files = ( AB0A0D8214AACE9500E83E91 /* ConvertUTF.c in Sources */, AB0A0D7714AACE9500E83E91 /* AAFilter.cpp in Sources */, - AB0A0D4614AACE9500E83E91 /* addons.cpp in Sources */, AB0A0D4714AACE9500E83E91 /* arm_instructions.cpp in Sources */, AB0A0D4814AACE9500E83E91 /* armcpu.cpp in Sources */, AB0A0D4914AACE9500E83E91 /* bios.cpp in Sources */, @@ -3273,6 +3283,8 @@ AB4352B517D66187007417C8 /* fsnitro.cpp in Sources */, AB4352C117D661AC007417C8 /* slot1_retail_mcrom_debug.cpp in Sources */, AB126D26182ECC7B00EBCF22 /* slot2_passme.cpp in Sources */, + ABB328E818313F5A00FEE4C4 /* slot2.cpp in Sources */, + ABB328F018313F7C00FEE4C4 /* slot2_auto.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3282,7 +3294,6 @@ files = ( AB1814D915D212B4007A6CC3 /* ConvertUTF.c in Sources */, AB1814DA15D212B4007A6CC3 /* AAFilter.cpp in Sources */, - AB1814DB15D212B4007A6CC3 /* addons.cpp in Sources */, AB1814DC15D212B4007A6CC3 /* arm_instructions.cpp in Sources */, AB1814DD15D212B4007A6CC3 /* armcpu.cpp in Sources */, AB1814DE15D212B4007A6CC3 /* bios.cpp in Sources */, @@ -3393,6 +3404,8 @@ AB4352B917D66187007417C8 /* fsnitro.cpp in Sources */, AB4352C517D661AC007417C8 /* slot1_retail_mcrom_debug.cpp in Sources */, AB126D25182ECC7B00EBCF22 /* slot2_passme.cpp in Sources */, + ABB328E718313F5A00FEE4C4 /* slot2.cpp in Sources */, + ABB328EF18313F7C00FEE4C4 /* slot2_auto.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3402,7 +3415,6 @@ files = ( AB18157515D21469007A6CC3 /* ConvertUTF.c in Sources */, AB18157615D21469007A6CC3 /* AAFilter.cpp in Sources */, - AB18157715D21469007A6CC3 /* addons.cpp in Sources */, AB18157815D21469007A6CC3 /* arm_instructions.cpp in Sources */, AB18157915D21469007A6CC3 /* armcpu.cpp in Sources */, AB18157A15D21469007A6CC3 /* bios.cpp in Sources */, @@ -3513,6 +3525,8 @@ AB4352BB17D66187007417C8 /* fsnitro.cpp in Sources */, AB4352C717D661AC007417C8 /* slot1_retail_mcrom_debug.cpp in Sources */, AB126D27182ECC7B00EBCF22 /* slot2_passme.cpp in Sources */, + ABB328E918313F5A00FEE4C4 /* slot2.cpp in Sources */, + ABB328F118313F7C00FEE4C4 /* slot2_auto.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3522,7 +3536,6 @@ files = ( AB18161115D214F2007A6CC3 /* ConvertUTF.c in Sources */, AB18161215D214F2007A6CC3 /* AAFilter.cpp in Sources */, - AB18161315D214F2007A6CC3 /* addons.cpp in Sources */, AB18161415D214F2007A6CC3 /* aggdraw.cpp in Sources */, AB18161515D214F2007A6CC3 /* arm_instructions.cpp in Sources */, AB18161615D214F2007A6CC3 /* armcpu.cpp in Sources */, @@ -3643,6 +3656,8 @@ AB4352B617D66187007417C8 /* fsnitro.cpp in Sources */, AB4352C217D661AC007417C8 /* slot1_retail_mcrom_debug.cpp in Sources */, AB126D2B182ECC7B00EBCF22 /* slot2_passme.cpp in Sources */, + ABB328ED18313F5A00FEE4C4 /* slot2.cpp in Sources */, + ABB328F518313F7C00FEE4C4 /* slot2_auto.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3652,7 +3667,6 @@ files = ( ABFE428D143E32F0009A3CCE /* ConvertUTF.c in Sources */, ABFE4282143E32F0009A3CCE /* AAFilter.cpp in Sources */, - ABFE4251143E32F0009A3CCE /* addons.cpp in Sources */, ABFE4252143E32F0009A3CCE /* arm_instructions.cpp in Sources */, ABFE4253143E32F0009A3CCE /* armcpu.cpp in Sources */, ABFE4254143E32F0009A3CCE /* bios.cpp in Sources */, @@ -3793,6 +3807,8 @@ AB4352B817D66187007417C8 /* fsnitro.cpp in Sources */, AB4352C417D661AC007417C8 /* slot1_retail_mcrom_debug.cpp in Sources */, AB126D29182ECC7B00EBCF22 /* slot2_passme.cpp in Sources */, + ABB328EB18313F5A00FEE4C4 /* slot2.cpp in Sources */, + ABB328F318313F7C00FEE4C4 /* slot2_auto.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj b/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj index aebaecd2d..166d27859 100644 --- a/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj +++ b/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj @@ -142,7 +142,6 @@ AB2A99ED1725F00F0062C1A1 /* AppIcon_FirmwareConfig.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB75226D14C7BB51009B97B3 /* AppIcon_FirmwareConfig.icns */; }; AB2A99EE1725F00F0062C1A1 /* DisplayWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB700DB816CDDBC400FBD336 /* DisplayWindow.xib */; }; AB2A99F11725F00F0062C1A1 /* ConvertUTF.c in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF1D1345ACBF00AF11D1 /* ConvertUTF.c */; }; - AB2A99F21725F00F0062C1A1 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA11345AC8400AF11D1 /* addons.cpp */; }; AB2A99F31725F00F0062C1A1 /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA31345AC8400AF11D1 /* arm_instructions.cpp */; }; AB2A99F41725F00F0062C1A1 /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA41345AC8400AF11D1 /* armcpu.cpp */; }; AB2A99F51725F00F0062C1A1 /* bios.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA51345AC8400AF11D1 /* bios.cpp */; }; @@ -344,7 +343,6 @@ AB2F3BC215CF9C6000858373 /* README.MAC in Resources */ = {isa = PBXBuildFile; fileRef = AB3ACC3D14C24D5400D7D192 /* README.MAC */; }; AB2F3BC315CF9C6000858373 /* AppIcon_FirmwareConfig.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB75226D14C7BB51009B97B3 /* AppIcon_FirmwareConfig.icns */; }; AB2F3BC515CF9C6000858373 /* ConvertUTF.c in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF1D1345ACBF00AF11D1 /* ConvertUTF.c */; }; - AB2F3BC715CF9C6000858373 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA11345AC8400AF11D1 /* addons.cpp */; }; AB2F3BC815CF9C6000858373 /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA31345AC8400AF11D1 /* arm_instructions.cpp */; }; AB2F3BC915CF9C6000858373 /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA41345AC8400AF11D1 /* armcpu.cpp */; }; AB2F3BCA15CF9C6000858373 /* bios.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA51345AC8400AF11D1 /* bios.cpp */; }; @@ -541,6 +539,16 @@ AB4C80AC17C5D7A00024D479 /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80A917C5D7A00024D479 /* advanscene.cpp */; }; AB4C80AD17C5D7A00024D479 /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80A917C5D7A00024D479 /* advanscene.cpp */; }; AB4C80AE17C5D7A00024D479 /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C80A917C5D7A00024D479 /* advanscene.cpp */; }; + AB53517F18313E3100CCD532 /* slot2_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB53517E18313E3100CCD532 /* slot2_auto.cpp */; }; + AB53518018313E3100CCD532 /* slot2_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB53517E18313E3100CCD532 /* slot2_auto.cpp */; }; + AB53518118313E3100CCD532 /* slot2_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB53517E18313E3100CCD532 /* slot2_auto.cpp */; }; + AB53518218313E3100CCD532 /* slot2_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB53517E18313E3100CCD532 /* slot2_auto.cpp */; }; + AB53518318313E3100CCD532 /* slot2_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB53517E18313E3100CCD532 /* slot2_auto.cpp */; }; + AB53518618313E4E00CCD532 /* slot2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB53518518313E4E00CCD532 /* slot2.cpp */; }; + AB53518718313E4E00CCD532 /* slot2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB53518518313E4E00CCD532 /* slot2.cpp */; }; + AB53518818313E4E00CCD532 /* slot2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB53518518313E4E00CCD532 /* slot2.cpp */; }; + AB53518918313E4E00CCD532 /* slot2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB53518518313E4E00CCD532 /* slot2.cpp */; }; + AB53518A18313E4E00CCD532 /* slot2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB53518518313E4E00CCD532 /* slot2.cpp */; }; AB5A795816D5A56000ED84B7 /* InputManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB5A795716D5A56000ED84B7 /* InputManager.mm */; }; AB5A795916D5A56000ED84B7 /* InputManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB5A795716D5A56000ED84B7 /* InputManager.mm */; }; AB5A795A16D5A56000ED84B7 /* InputManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB5A795716D5A56000ED84B7 /* InputManager.mm */; }; @@ -576,7 +584,6 @@ AB711EFC1481C35F009011C8 /* Icon_CodeBreaker_32x32.png in Resources */ = {isa = PBXBuildFile; fileRef = ABB97874144E89CC00793FA3 /* Icon_CodeBreaker_32x32.png */; }; AB711EFD1481C35F009011C8 /* Icon_DeSmuME_32x32.png in Resources */ = {isa = PBXBuildFile; fileRef = ABB97875144E89CC00793FA3 /* Icon_DeSmuME_32x32.png */; }; AB711EFE1481C35F009011C8 /* HID_usage_strings.plist in Resources */ = {isa = PBXBuildFile; fileRef = AB350D3A147A1D93007165AC /* HID_usage_strings.plist */; }; - AB711F001481C35F009011C8 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA11345AC8400AF11D1 /* addons.cpp */; }; AB711F011481C35F009011C8 /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA31345AC8400AF11D1 /* arm_instructions.cpp */; }; AB711F021481C35F009011C8 /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA41345AC8400AF11D1 /* armcpu.cpp */; }; AB711F031481C35F009011C8 /* bios.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA51345AC8400AF11D1 /* bios.cpp */; }; @@ -744,7 +751,6 @@ AB73A9B01507C9F500A310C8 /* README.MAC in Resources */ = {isa = PBXBuildFile; fileRef = AB3ACC3D14C24D5400D7D192 /* README.MAC */; }; AB73A9B11507C9F500A310C8 /* AppIcon_FirmwareConfig.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB75226D14C7BB51009B97B3 /* AppIcon_FirmwareConfig.icns */; }; AB73A9B31507C9F500A310C8 /* ConvertUTF.c in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF1D1345ACBF00AF11D1 /* ConvertUTF.c */; }; - AB73A9B51507C9F500A310C8 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA11345AC8400AF11D1 /* addons.cpp */; }; AB73A9B61507C9F500A310C8 /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA31345AC8400AF11D1 /* arm_instructions.cpp */; }; AB73A9B71507C9F500A310C8 /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA41345AC8400AF11D1 /* armcpu.cpp */; }; AB73A9B81507C9F500A310C8 /* bios.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA51345AC8400AF11D1 /* bios.cpp */; }; @@ -947,7 +953,6 @@ ABAD0FB815ACE7A00000EC47 /* README.MAC in Resources */ = {isa = PBXBuildFile; fileRef = AB3ACC3D14C24D5400D7D192 /* README.MAC */; }; ABAD0FB915ACE7A00000EC47 /* AppIcon_FirmwareConfig.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB75226D14C7BB51009B97B3 /* AppIcon_FirmwareConfig.icns */; }; ABAD0FBB15ACE7A00000EC47 /* ConvertUTF.c in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF1D1345ACBF00AF11D1 /* ConvertUTF.c */; }; - ABAD0FBD15ACE7A00000EC47 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA11345AC8400AF11D1 /* addons.cpp */; }; ABAD0FBE15ACE7A00000EC47 /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA31345AC8400AF11D1 /* arm_instructions.cpp */; }; ABAD0FBF15ACE7A00000EC47 /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA41345AC8400AF11D1 /* armcpu.cpp */; }; ABAD0FC015ACE7A00000EC47 /* bios.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA51345AC8400AF11D1 /* bios.cpp */; }; @@ -1254,6 +1259,9 @@ AB4C808C17C5D7780024D479 /* slot1comp_rom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slot1comp_rom.h; sourceTree = ""; }; AB4C80A817C5D7A00024D479 /* advanscene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = advanscene.h; sourceTree = ""; }; AB4C80A917C5D7A00024D479 /* advanscene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = advanscene.cpp; sourceTree = ""; }; + AB53517E18313E3100CCD532 /* slot2_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot2_auto.cpp; sourceTree = ""; }; + AB53518418313E4E00CCD532 /* slot2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = slot2.h; path = ../slot2.h; sourceTree = SOURCE_ROOT; }; + AB53518518313E4E00CCD532 /* slot2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = slot2.cpp; path = ../slot2.cpp; sourceTree = SOURCE_ROOT; }; AB58F32B1364F44B0074C376 /* cocoa_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_file.h; sourceTree = ""; }; AB58F32C1364F44B0074C376 /* cocoa_file.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_file.mm; sourceTree = ""; }; AB5A795616D5A56000ED84B7 /* InputManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputManager.h; sourceTree = ""; }; @@ -1324,7 +1332,6 @@ ABD104141346652500AF11D1 /* sndOSX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sndOSX.cpp; sourceTree = ""; }; ABD104271346653B00AF11D1 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; ABD10452134666DD00AF11D1 /* DeSmuME_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeSmuME_Prefix.pch; sourceTree = ""; }; - ABD1FE6B1345AC8400AF11D1 /* addons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = addons.h; path = ../addons.h; sourceTree = SOURCE_ROOT; }; ABD1FE6C1345AC8400AF11D1 /* agg2d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = agg2d.h; path = ../agg2d.h; sourceTree = SOURCE_ROOT; }; ABD1FE6D1345AC8400AF11D1 /* aggdraw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aggdraw.h; path = ../aggdraw.h; sourceTree = SOURCE_ROOT; }; ABD1FE6F1345AC8400AF11D1 /* armcpu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = armcpu.h; path = ../armcpu.h; sourceTree = SOURCE_ROOT; }; @@ -1375,7 +1382,6 @@ ABD1FE9E1345AC8400AF11D1 /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = types.h; path = ../types.h; sourceTree = SOURCE_ROOT; }; ABD1FE9F1345AC8400AF11D1 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = version.h; path = ../version.h; sourceTree = SOURCE_ROOT; }; ABD1FEA01345AC8400AF11D1 /* wifi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wifi.h; path = ../wifi.h; sourceTree = SOURCE_ROOT; }; - ABD1FEA11345AC8400AF11D1 /* addons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = addons.cpp; path = ../addons.cpp; sourceTree = SOURCE_ROOT; }; ABD1FEA21345AC8400AF11D1 /* aggdraw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = aggdraw.cpp; path = ../aggdraw.cpp; sourceTree = SOURCE_ROOT; }; ABD1FEA31345AC8400AF11D1 /* arm_instructions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = arm_instructions.cpp; path = ../arm_instructions.cpp; sourceTree = SOURCE_ROOT; }; ABD1FEA41345AC8400AF11D1 /* armcpu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = armcpu.cpp; path = ../armcpu.cpp; sourceTree = SOURCE_ROOT; }; @@ -1930,7 +1936,6 @@ ABFE14F914C92FF5005D6699 /* filter */, ABD1FF761345ACFA00AF11D1 /* metaspu */, ABD1FF1C1345ACBF00AF11D1 /* utils */, - ABD1FEA11345AC8400AF11D1 /* addons.cpp */, ABD1FEA21345AC8400AF11D1 /* aggdraw.cpp */, ABD1FEA31345AC8400AF11D1 /* arm_instructions.cpp */, ABBCE29515ACB1FF00A2C965 /* arm_jit.cpp */, @@ -1972,13 +1977,13 @@ ABD1FEC71345AC8400AF11D1 /* rtc.cpp */, ABD1FEC81345AC8400AF11D1 /* saves.cpp */, ABD1FEC91345AC8400AF11D1 /* slot1.cpp */, + AB53518518313E4E00CCD532 /* slot2.cpp */, ABD1FECA1345AC8400AF11D1 /* sndsdl.cpp */, ABD1FECB1345AC8400AF11D1 /* SPU.cpp */, ABD1FECC1345AC8400AF11D1 /* texcache.cpp */, ABD1FECD1345AC8400AF11D1 /* thumb_instructions.cpp */, ABD1FECE1345AC8400AF11D1 /* version.cpp */, ABD1FECF1345AC8400AF11D1 /* wifi.cpp */, - ABD1FE6B1345AC8400AF11D1 /* addons.h */, ABD1FE6C1345AC8400AF11D1 /* agg2d.h */, ABD1FE6D1345AC8400AF11D1 /* aggdraw.h */, ABBCE29415ACB1E600A2C965 /* arm_jit.h */, @@ -2027,6 +2032,7 @@ ABD1FE961345AC8400AF11D1 /* rtc.h */, ABD1FE971345AC8400AF11D1 /* saves.h */, ABD1FE991345AC8400AF11D1 /* slot1.h */, + AB53518418313E4E00CCD532 /* slot2.h */, ABD1FE9A1345AC8400AF11D1 /* sndsdl.h */, ABD1FE9B1345AC8400AF11D1 /* SPU.h */, ABD1FE9C1345AC8400AF11D1 /* texcache.h */, @@ -2049,6 +2055,7 @@ AB4C808917C5D7780024D479 /* slot1comp_mc.cpp */, ABB9212017CEB4110049D4C5 /* slot1comp_protocol.cpp */, AB4C808B17C5D7780024D479 /* slot1comp_rom.cpp */, + AB53517E18313E3100CCD532 /* slot2_auto.cpp */, ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */, ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */, ABD1FF051345AC9B00AF11D1 /* slot2_guitarGrip.cpp */, @@ -3003,7 +3010,6 @@ buildActionMask = 2147483647; files = ( AB2A99F11725F00F0062C1A1 /* ConvertUTF.c in Sources */, - AB2A99F21725F00F0062C1A1 /* addons.cpp in Sources */, AB2A99F31725F00F0062C1A1 /* arm_instructions.cpp in Sources */, AB2A99F41725F00F0062C1A1 /* armcpu.cpp in Sources */, AB2A99F51725F00F0062C1A1 /* bios.cpp in Sources */, @@ -3134,6 +3140,8 @@ AB43527617D5BA5E007417C8 /* slot1_retail_mcrom_debug.cpp in Sources */, AB43528B17D5BA95007417C8 /* fsnitro.cpp in Sources */, AB126D0B182ECB9500EBCF22 /* slot2_passme.cpp in Sources */, + AB53518318313E3100CCD532 /* slot2_auto.cpp in Sources */, + AB53518A18313E4E00CCD532 /* slot2.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3142,7 +3150,6 @@ buildActionMask = 2147483647; files = ( AB2F3BC515CF9C6000858373 /* ConvertUTF.c in Sources */, - AB2F3BC715CF9C6000858373 /* addons.cpp in Sources */, AB2F3BC815CF9C6000858373 /* arm_instructions.cpp in Sources */, AB2F3BC915CF9C6000858373 /* armcpu.cpp in Sources */, AB2F3BCA15CF9C6000858373 /* bios.cpp in Sources */, @@ -3273,6 +3280,8 @@ AB43527317D5BA5E007417C8 /* slot1_retail_mcrom_debug.cpp in Sources */, AB43528817D5BA95007417C8 /* fsnitro.cpp in Sources */, AB126D08182ECB9500EBCF22 /* slot2_passme.cpp in Sources */, + AB53518018313E3100CCD532 /* slot2_auto.cpp in Sources */, + AB53518718313E4E00CCD532 /* slot2.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3281,7 +3290,6 @@ buildActionMask = 2147483647; files = ( AB711F2D1481C35F009011C8 /* ConvertUTF.c in Sources */, - AB711F001481C35F009011C8 /* addons.cpp in Sources */, AB711F011481C35F009011C8 /* arm_instructions.cpp in Sources */, AB711F021481C35F009011C8 /* armcpu.cpp in Sources */, AB711F031481C35F009011C8 /* bios.cpp in Sources */, @@ -3442,6 +3450,8 @@ AB43527217D5BA5E007417C8 /* slot1_retail_mcrom_debug.cpp in Sources */, AB43528717D5BA95007417C8 /* fsnitro.cpp in Sources */, AB126D07182ECB9500EBCF22 /* slot2_passme.cpp in Sources */, + AB53517F18313E3100CCD532 /* slot2_auto.cpp in Sources */, + AB53518618313E4E00CCD532 /* slot2.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3450,7 +3460,6 @@ buildActionMask = 2147483647; files = ( AB73A9B31507C9F500A310C8 /* ConvertUTF.c in Sources */, - AB73A9B51507C9F500A310C8 /* addons.cpp in Sources */, AB73A9B61507C9F500A310C8 /* arm_instructions.cpp in Sources */, AB73A9B71507C9F500A310C8 /* armcpu.cpp in Sources */, AB73A9B81507C9F500A310C8 /* bios.cpp in Sources */, @@ -3611,6 +3620,8 @@ AB43527517D5BA5E007417C8 /* slot1_retail_mcrom_debug.cpp in Sources */, AB43528A17D5BA95007417C8 /* fsnitro.cpp in Sources */, AB126D0A182ECB9500EBCF22 /* slot2_passme.cpp in Sources */, + AB53518218313E3100CCD532 /* slot2_auto.cpp in Sources */, + AB53518918313E4E00CCD532 /* slot2.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3619,7 +3630,6 @@ buildActionMask = 2147483647; files = ( ABAD0FBB15ACE7A00000EC47 /* ConvertUTF.c in Sources */, - ABAD0FBD15ACE7A00000EC47 /* addons.cpp in Sources */, ABAD0FBE15ACE7A00000EC47 /* arm_instructions.cpp in Sources */, ABAD0FBF15ACE7A00000EC47 /* armcpu.cpp in Sources */, ABAD0FC015ACE7A00000EC47 /* bios.cpp in Sources */, @@ -3750,6 +3760,8 @@ AB43527417D5BA5E007417C8 /* slot1_retail_mcrom_debug.cpp in Sources */, AB43528917D5BA95007417C8 /* fsnitro.cpp in Sources */, AB126D09182ECB9500EBCF22 /* slot2_passme.cpp in Sources */, + AB53518118313E3100CCD532 /* slot2_auto.cpp in Sources */, + AB53518818313E4E00CCD532 /* slot2.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj b/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj index b3539b1b8..341b92a27 100644 --- a/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj +++ b/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj @@ -66,6 +66,12 @@ AB15CA7214A29EE500B8A6A4 /* cpu_detect_x86_gcc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6613AF1D6D00502E1E /* cpu_detect_x86_gcc.cpp */; }; AB181D0013B66889006CA82D /* datetime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF1F1345ACBF00AF11D1 /* datetime.cpp */; }; AB1949DB15034F900098793E /* OESoundInterface.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABB3C6401501BB8300E0C22E /* OESoundInterface.mm */; }; + AB1B702C18313D7700E64141 /* slot2_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB1B702B18313D7700E64141 /* slot2_auto.cpp */; }; + AB1B702D18313D7700E64141 /* slot2_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB1B702B18313D7700E64141 /* slot2_auto.cpp */; }; + AB1B702E18313D7700E64141 /* slot2_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB1B702B18313D7700E64141 /* slot2_auto.cpp */; }; + AB1B703018313D9000E64141 /* slot2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB1B702F18313D9000E64141 /* slot2.cpp */; }; + AB1B703118313D9000E64141 /* slot2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB1B702F18313D9000E64141 /* slot2.cpp */; }; + AB1B703218313D9000E64141 /* slot2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB1B702F18313D9000E64141 /* slot2.cpp */; }; AB1B9E631501A78000464647 /* coreaudiosound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB1B9E5F1501A78000464647 /* coreaudiosound.cpp */; }; AB1B9E661501A78000464647 /* ringbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB1B9E601501A78000464647 /* ringbuffer.cpp */; }; AB1F468413A0ADE400B80DE6 /* SndOut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF7A1345ACFA00AF11D1 /* SndOut.cpp */; }; @@ -274,7 +280,6 @@ AB796CED15CDCBA200C59155 /* AppIcon_FirmwareConfig.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB75226D14C7BB51009B97B3 /* AppIcon_FirmwareConfig.icns */; }; AB796CEF15CDCBA200C59155 /* ConvertUTF.c in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF1D1345ACBF00AF11D1 /* ConvertUTF.c */; }; AB796CF015CDCBA200C59155 /* AAFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6513AF1D6D00502E1E /* AAFilter.cpp */; }; - AB796CF115CDCBA200C59155 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA11345AC8400AF11D1 /* addons.cpp */; }; AB796CF215CDCBA200C59155 /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA31345AC8400AF11D1 /* arm_instructions.cpp */; }; AB796CF315CDCBA200C59155 /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA41345AC8400AF11D1 /* armcpu.cpp */; }; AB796CF415CDCBA200C59155 /* bios.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA51345AC8400AF11D1 /* bios.cpp */; }; @@ -487,7 +492,6 @@ ABB3C6B01501C04F00E0C22E /* task.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF4C1345ACBF00AF11D1 /* task.cpp */; }; ABB3C6B11501C04F00E0C22E /* vfat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF4F1345ACBF00AF11D1 /* vfat.cpp */; }; ABB3C6B21501C04F00E0C22E /* xstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF511345ACBF00AF11D1 /* xstring.cpp */; }; - ABB3C6B31501C04F00E0C22E /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA11345AC8400AF11D1 /* addons.cpp */; }; ABB3C6B41501C04F00E0C22E /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA31345AC8400AF11D1 /* arm_instructions.cpp */; }; ABB3C6B51501C04F00E0C22E /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA41345AC8400AF11D1 /* armcpu.cpp */; }; ABB3C6B61501C04F00E0C22E /* bios.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA51345AC8400AF11D1 /* bios.cpp */; }; @@ -549,7 +553,6 @@ ABD10AEC1715FCDD00B5729D /* mic_ext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD10AE61715FCDD00B5729D /* mic_ext.cpp */; }; ABD10AED17160C9300B5729D /* ringbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB1B9E601501A78000464647 /* ringbuffer.cpp */; }; ABD10AEE17160CDD00B5729D /* cocoa_input.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABD104111346652500AF11D1 /* cocoa_input.mm */; }; - ABD1FED01345AC8400AF11D1 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA11345AC8400AF11D1 /* addons.cpp */; }; ABD1FED21345AC8400AF11D1 /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA31345AC8400AF11D1 /* arm_instructions.cpp */; }; ABD1FED31345AC8400AF11D1 /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA41345AC8400AF11D1 /* armcpu.cpp */; }; ABD1FED41345AC8400AF11D1 /* bios.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA51345AC8400AF11D1 /* bios.cpp */; }; @@ -723,6 +726,9 @@ AB0F29A414BE7213009ABC6F /* Icon_ShowHUD_420x420.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_ShowHUD_420x420.png; path = images/Icon_ShowHUD_420x420.png; sourceTree = ""; }; AB0F29A514BE7213009ABC6F /* Icon_Speaker_420x420.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_Speaker_420x420.png; path = images/Icon_Speaker_420x420.png; sourceTree = ""; }; AB107684182ECB29000D6F67 /* slot2_passme.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot2_passme.cpp; sourceTree = ""; }; + AB1B702B18313D7700E64141 /* slot2_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot2_auto.cpp; sourceTree = ""; }; + AB1B702F18313D9000E64141 /* slot2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = slot2.cpp; path = ../slot2.cpp; sourceTree = ""; }; + AB1B703318313D9F00E64141 /* slot2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = slot2.h; path = ../slot2.h; sourceTree = ""; }; AB1B9E5F1501A78000464647 /* coreaudiosound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = coreaudiosound.cpp; sourceTree = ""; }; AB1B9E601501A78000464647 /* ringbuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ringbuffer.cpp; sourceTree = ""; }; AB1B9E611501A78000464647 /* coreaudiosound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coreaudiosound.h; sourceTree = ""; }; @@ -911,7 +917,6 @@ ABD10AE41715FCDD00B5729D /* mic_ext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mic_ext.h; sourceTree = SOURCE_ROOT; }; ABD10AE51715FCDD00B5729D /* audiosamplegenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = audiosamplegenerator.cpp; sourceTree = SOURCE_ROOT; }; ABD10AE61715FCDD00B5729D /* mic_ext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mic_ext.cpp; sourceTree = SOURCE_ROOT; }; - ABD1FE6B1345AC8400AF11D1 /* addons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = addons.h; path = ../addons.h; sourceTree = SOURCE_ROOT; }; ABD1FE6C1345AC8400AF11D1 /* agg2d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = agg2d.h; path = ../agg2d.h; sourceTree = SOURCE_ROOT; }; ABD1FE6D1345AC8400AF11D1 /* aggdraw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aggdraw.h; path = ../aggdraw.h; sourceTree = SOURCE_ROOT; }; ABD1FE6F1345AC8400AF11D1 /* armcpu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = armcpu.h; path = ../armcpu.h; sourceTree = SOURCE_ROOT; }; @@ -962,7 +967,6 @@ ABD1FE9E1345AC8400AF11D1 /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = types.h; path = ../types.h; sourceTree = SOURCE_ROOT; }; ABD1FE9F1345AC8400AF11D1 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = version.h; path = ../version.h; sourceTree = SOURCE_ROOT; }; ABD1FEA01345AC8400AF11D1 /* wifi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wifi.h; path = ../wifi.h; sourceTree = SOURCE_ROOT; }; - ABD1FEA11345AC8400AF11D1 /* addons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = addons.cpp; path = ../addons.cpp; sourceTree = SOURCE_ROOT; }; ABD1FEA21345AC8400AF11D1 /* aggdraw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = aggdraw.cpp; path = ../aggdraw.cpp; sourceTree = SOURCE_ROOT; }; ABD1FEA31345AC8400AF11D1 /* arm_instructions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = arm_instructions.cpp; path = ../arm_instructions.cpp; sourceTree = SOURCE_ROOT; }; ABD1FEA41345AC8400AF11D1 /* armcpu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = armcpu.cpp; path = ../armcpu.cpp; sourceTree = SOURCE_ROOT; }; @@ -1521,7 +1525,6 @@ ABFE14F914C92FF5005D6699 /* filter */, ABD1FF761345ACFA00AF11D1 /* metaspu */, ABD1FF1C1345ACBF00AF11D1 /* utils */, - ABD1FEA11345AC8400AF11D1 /* addons.cpp */, ABD1FEA21345AC8400AF11D1 /* aggdraw.cpp */, ABD1FEA31345AC8400AF11D1 /* arm_instructions.cpp */, AB796C9B15CDCB0F00C59155 /* arm_jit.cpp */, @@ -1564,13 +1567,13 @@ ABD1FEC71345AC8400AF11D1 /* rtc.cpp */, ABD1FEC81345AC8400AF11D1 /* saves.cpp */, ABD1FEC91345AC8400AF11D1 /* slot1.cpp */, + AB1B702F18313D9000E64141 /* slot2.cpp */, ABD1FECA1345AC8400AF11D1 /* sndsdl.cpp */, ABD1FECB1345AC8400AF11D1 /* SPU.cpp */, ABD1FECC1345AC8400AF11D1 /* texcache.cpp */, ABD1FECD1345AC8400AF11D1 /* thumb_instructions.cpp */, ABD1FECE1345AC8400AF11D1 /* version.cpp */, ABD1FECF1345AC8400AF11D1 /* wifi.cpp */, - ABD1FE6B1345AC8400AF11D1 /* addons.h */, ABD1FE6C1345AC8400AF11D1 /* agg2d.h */, ABD1FE6D1345AC8400AF11D1 /* aggdraw.h */, ABD1FE6F1345AC8400AF11D1 /* armcpu.h */, @@ -1620,6 +1623,7 @@ ABD1FE961345AC8400AF11D1 /* rtc.h */, ABD1FE971345AC8400AF11D1 /* saves.h */, ABD1FE991345AC8400AF11D1 /* slot1.h */, + AB1B703318313D9F00E64141 /* slot2.h */, ABD1FE9A1345AC8400AF11D1 /* sndsdl.h */, ABD1FE9B1345AC8400AF11D1 /* SPU.h */, ABD1FE9C1345AC8400AF11D1 /* texcache.h */, @@ -1642,6 +1646,7 @@ ABFE7C8917C5D03C0028DC56 /* slot1comp_mc.cpp */, ABF55C2717CEB38F00A193FD /* slot1comp_protocol.cpp */, ABFE7C8A17C5D03C0028DC56 /* slot1comp_rom.cpp */, + AB1B702B18313D7700E64141 /* slot2_auto.cpp */, ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */, ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */, ABD1FF051345AC9B00AF11D1 /* slot2_guitarGrip.cpp */, @@ -2190,7 +2195,6 @@ files = ( ABD1FF531345ACBF00AF11D1 /* ConvertUTF.c in Sources */, ABAD3E7113AF1D6D00502E1E /* AAFilter.cpp in Sources */, - ABD1FED01345AC8400AF11D1 /* addons.cpp in Sources */, ABD1FED21345AC8400AF11D1 /* arm_instructions.cpp in Sources */, ABD1FED31345AC8400AF11D1 /* armcpu.cpp in Sources */, ABD1FED41345AC8400AF11D1 /* bios.cpp in Sources */, @@ -2352,6 +2356,8 @@ AB497A9C17D583EE0045B888 /* fsnitro.cpp in Sources */, AB497AA017D584570045B888 /* slot1_retail_mcrom_debug.cpp in Sources */, AB107686182ECB29000D6F67 /* slot2_passme.cpp in Sources */, + AB1B702D18313D7700E64141 /* slot2_auto.cpp in Sources */, + AB1B703118313D9000E64141 /* slot2.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2361,7 +2367,6 @@ files = ( AB796CEF15CDCBA200C59155 /* ConvertUTF.c in Sources */, AB796CF015CDCBA200C59155 /* AAFilter.cpp in Sources */, - AB796CF115CDCBA200C59155 /* addons.cpp in Sources */, AB796CF215CDCBA200C59155 /* arm_instructions.cpp in Sources */, AB796CF315CDCBA200C59155 /* armcpu.cpp in Sources */, AB796CF415CDCBA200C59155 /* bios.cpp in Sources */, @@ -2522,6 +2527,8 @@ AB497A9B17D583EE0045B888 /* fsnitro.cpp in Sources */, AB497A9F17D584570045B888 /* slot1_retail_mcrom_debug.cpp in Sources */, AB107685182ECB29000D6F67 /* slot2_passme.cpp in Sources */, + AB1B702C18313D7700E64141 /* slot2_auto.cpp in Sources */, + AB1B703018313D9000E64141 /* slot2.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2594,7 +2601,6 @@ ABB3C6B01501C04F00E0C22E /* task.cpp in Sources */, ABB3C6B11501C04F00E0C22E /* vfat.cpp in Sources */, ABB3C6B21501C04F00E0C22E /* xstring.cpp in Sources */, - ABB3C6B31501C04F00E0C22E /* addons.cpp in Sources */, ABB3C6B41501C04F00E0C22E /* arm_instructions.cpp in Sources */, ABB3C6B51501C04F00E0C22E /* armcpu.cpp in Sources */, ABB3C6B61501C04F00E0C22E /* bios.cpp in Sources */, @@ -2681,6 +2687,8 @@ AB497A9D17D583EE0045B888 /* fsnitro.cpp in Sources */, AB497AA117D584570045B888 /* slot1_retail_mcrom_debug.cpp in Sources */, AB107687182ECB29000D6F67 /* slot2_passme.cpp in Sources */, + AB1B702E18313D7700E64141 /* slot2_auto.cpp in Sources */, + AB1B703218313D9000E64141 /* slot2.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/desmume/src/cocoa/DeSmuME (Xcode 5).xcodeproj/project.pbxproj b/desmume/src/cocoa/DeSmuME (Xcode 5).xcodeproj/project.pbxproj index f64f41527..adc6b21be 100644 --- a/desmume/src/cocoa/DeSmuME (Xcode 5).xcodeproj/project.pbxproj +++ b/desmume/src/cocoa/DeSmuME (Xcode 5).xcodeproj/project.pbxproj @@ -73,6 +73,12 @@ AB23567416C2F6F400DA782E /* macosx_10_5_compat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB23567216C2F6F400DA782E /* macosx_10_5_compat.cpp */; }; AB23567516C2FAD800DA782E /* OGLRender_3_2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB68A0DA16B139BC00DE0546 /* OGLRender_3_2.cpp */; }; AB26D87C16B5253D00A2305C /* OGLRender_3_2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB68A0DA16B139BC00DE0546 /* OGLRender_3_2.cpp */; }; + AB29B16218313AF5009B7982 /* slot2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB29B16118313AF5009B7982 /* slot2.cpp */; }; + AB29B16318313AF5009B7982 /* slot2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB29B16118313AF5009B7982 /* slot2.cpp */; }; + AB29B16418313AF5009B7982 /* slot2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB29B16118313AF5009B7982 /* slot2.cpp */; }; + AB29B16618313C14009B7982 /* slot2_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB29B16518313C14009B7982 /* slot2_auto.cpp */; }; + AB29B16718313C14009B7982 /* slot2_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB29B16518313C14009B7982 /* slot2_auto.cpp */; }; + AB29B16818313C14009B7982 /* slot2_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB29B16518313C14009B7982 /* slot2_auto.cpp */; }; AB29B33116D4BEBF000EF671 /* InputManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB29B33016D4BEBF000EF671 /* InputManager.mm */; }; AB29B33216D4BEBF000EF671 /* InputManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB29B33016D4BEBF000EF671 /* InputManager.mm */; }; AB2EE12C17D57ED500F68622 /* slot1_retail_mcrom_debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB2EE12B17D57ED500F68622 /* slot1_retail_mcrom_debug.cpp */; }; @@ -274,7 +280,6 @@ AB796CED15CDCBA200C59155 /* AppIcon_FirmwareConfig.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB75226D14C7BB51009B97B3 /* AppIcon_FirmwareConfig.icns */; }; AB796CEF15CDCBA200C59155 /* ConvertUTF.c in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF1D1345ACBF00AF11D1 /* ConvertUTF.c */; }; AB796CF015CDCBA200C59155 /* AAFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6513AF1D6D00502E1E /* AAFilter.cpp */; }; - AB796CF115CDCBA200C59155 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA11345AC8400AF11D1 /* addons.cpp */; }; AB796CF215CDCBA200C59155 /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA31345AC8400AF11D1 /* arm_instructions.cpp */; }; AB796CF315CDCBA200C59155 /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA41345AC8400AF11D1 /* armcpu.cpp */; }; AB796CF415CDCBA200C59155 /* bios.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA51345AC8400AF11D1 /* bios.cpp */; }; @@ -505,7 +510,6 @@ ABB3C6B01501C04F00E0C22E /* task.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF4C1345ACBF00AF11D1 /* task.cpp */; }; ABB3C6B11501C04F00E0C22E /* vfat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF4F1345ACBF00AF11D1 /* vfat.cpp */; }; ABB3C6B21501C04F00E0C22E /* xstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF511345ACBF00AF11D1 /* xstring.cpp */; }; - ABB3C6B31501C04F00E0C22E /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA11345AC8400AF11D1 /* addons.cpp */; }; ABB3C6B41501C04F00E0C22E /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA31345AC8400AF11D1 /* arm_instructions.cpp */; }; ABB3C6B51501C04F00E0C22E /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA41345AC8400AF11D1 /* armcpu.cpp */; }; ABB3C6B61501C04F00E0C22E /* bios.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA51345AC8400AF11D1 /* bios.cpp */; }; @@ -570,7 +574,6 @@ ABD10AEC1715FCDD00B5729D /* mic_ext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD10AE61715FCDD00B5729D /* mic_ext.cpp */; }; ABD10AED17160C9300B5729D /* ringbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB1B9E601501A78000464647 /* ringbuffer.cpp */; }; ABD10AEE17160CDD00B5729D /* cocoa_input.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABD104111346652500AF11D1 /* cocoa_input.mm */; }; - ABD1FED01345AC8400AF11D1 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA11345AC8400AF11D1 /* addons.cpp */; }; ABD1FED21345AC8400AF11D1 /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA31345AC8400AF11D1 /* arm_instructions.cpp */; }; ABD1FED31345AC8400AF11D1 /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA41345AC8400AF11D1 /* armcpu.cpp */; }; ABD1FED41345AC8400AF11D1 /* bios.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA51345AC8400AF11D1 /* bios.cpp */; }; @@ -728,6 +731,9 @@ AB1B9E611501A78000464647 /* coreaudiosound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coreaudiosound.h; sourceTree = ""; }; AB1B9E621501A78000464647 /* ringbuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ringbuffer.h; sourceTree = ""; }; AB23567216C2F6F400DA782E /* macosx_10_5_compat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = macosx_10_5_compat.cpp; sourceTree = ""; }; + AB29B15C18313ACD009B7982 /* slot2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = slot2.h; path = ../slot2.h; sourceTree = ""; }; + AB29B16118313AF5009B7982 /* slot2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = slot2.cpp; path = ../slot2.cpp; sourceTree = ""; }; + AB29B16518313C14009B7982 /* slot2_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot2_auto.cpp; sourceTree = ""; }; AB29B32F16D4BEBF000EF671 /* InputManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputManager.h; sourceTree = ""; }; AB29B33016D4BEBF000EF671 /* InputManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = InputManager.mm; sourceTree = ""; }; AB2EE12B17D57ED500F68622 /* slot1_retail_mcrom_debug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_retail_mcrom_debug.cpp; sourceTree = ""; }; @@ -923,7 +929,6 @@ ABD10AE41715FCDD00B5729D /* mic_ext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mic_ext.h; sourceTree = SOURCE_ROOT; }; ABD10AE51715FCDD00B5729D /* audiosamplegenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = audiosamplegenerator.cpp; sourceTree = SOURCE_ROOT; }; ABD10AE61715FCDD00B5729D /* mic_ext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mic_ext.cpp; sourceTree = SOURCE_ROOT; }; - ABD1FE6B1345AC8400AF11D1 /* addons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = addons.h; path = ../addons.h; sourceTree = SOURCE_ROOT; }; ABD1FE6C1345AC8400AF11D1 /* agg2d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = agg2d.h; path = ../agg2d.h; sourceTree = SOURCE_ROOT; }; ABD1FE6D1345AC8400AF11D1 /* aggdraw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aggdraw.h; path = ../aggdraw.h; sourceTree = SOURCE_ROOT; }; ABD1FE6F1345AC8400AF11D1 /* armcpu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = armcpu.h; path = ../armcpu.h; sourceTree = SOURCE_ROOT; }; @@ -974,7 +979,6 @@ ABD1FE9E1345AC8400AF11D1 /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = types.h; path = ../types.h; sourceTree = SOURCE_ROOT; }; ABD1FE9F1345AC8400AF11D1 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = version.h; path = ../version.h; sourceTree = SOURCE_ROOT; }; ABD1FEA01345AC8400AF11D1 /* wifi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wifi.h; path = ../wifi.h; sourceTree = SOURCE_ROOT; }; - ABD1FEA11345AC8400AF11D1 /* addons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = addons.cpp; path = ../addons.cpp; sourceTree = SOURCE_ROOT; }; ABD1FEA21345AC8400AF11D1 /* aggdraw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = aggdraw.cpp; path = ../aggdraw.cpp; sourceTree = SOURCE_ROOT; }; ABD1FEA31345AC8400AF11D1 /* arm_instructions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = arm_instructions.cpp; path = ../arm_instructions.cpp; sourceTree = SOURCE_ROOT; }; ABD1FEA41345AC8400AF11D1 /* armcpu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = armcpu.cpp; path = ../armcpu.cpp; sourceTree = SOURCE_ROOT; }; @@ -1521,7 +1525,6 @@ ABFE14F914C92FF5005D6699 /* filter */, ABD1FF761345ACFA00AF11D1 /* metaspu */, ABD1FF1C1345ACBF00AF11D1 /* utils */, - ABD1FEA11345AC8400AF11D1 /* addons.cpp */, ABD1FEA21345AC8400AF11D1 /* aggdraw.cpp */, ABD1FEA31345AC8400AF11D1 /* arm_instructions.cpp */, AB796C9B15CDCB0F00C59155 /* arm_jit.cpp */, @@ -1564,13 +1567,13 @@ ABD1FEC71345AC8400AF11D1 /* rtc.cpp */, ABD1FEC81345AC8400AF11D1 /* saves.cpp */, ABD1FEC91345AC8400AF11D1 /* slot1.cpp */, + AB29B16118313AF5009B7982 /* slot2.cpp */, ABD1FECA1345AC8400AF11D1 /* sndsdl.cpp */, ABD1FECB1345AC8400AF11D1 /* SPU.cpp */, ABD1FECC1345AC8400AF11D1 /* texcache.cpp */, ABD1FECD1345AC8400AF11D1 /* thumb_instructions.cpp */, ABD1FECE1345AC8400AF11D1 /* version.cpp */, ABD1FECF1345AC8400AF11D1 /* wifi.cpp */, - ABD1FE6B1345AC8400AF11D1 /* addons.h */, ABD1FE6C1345AC8400AF11D1 /* agg2d.h */, ABD1FE6D1345AC8400AF11D1 /* aggdraw.h */, ABD1FE6F1345AC8400AF11D1 /* armcpu.h */, @@ -1620,6 +1623,7 @@ ABD1FE961345AC8400AF11D1 /* rtc.h */, ABD1FE971345AC8400AF11D1 /* saves.h */, ABD1FE991345AC8400AF11D1 /* slot1.h */, + AB29B15C18313ACD009B7982 /* slot2.h */, ABD1FE9A1345AC8400AF11D1 /* sndsdl.h */, ABD1FE9B1345AC8400AF11D1 /* SPU.h */, ABD1FE9C1345AC8400AF11D1 /* texcache.h */, @@ -1642,6 +1646,7 @@ AB9038AB17C5ED2200F410BD /* slot1comp_mc.cpp */, AB8B7AAB17CE8C440051CEBF /* slot1comp_protocol.cpp */, AB9038AD17C5ED2200F410BD /* slot1comp_rom.cpp */, + AB29B16518313C14009B7982 /* slot2_auto.cpp */, ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */, ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */, ABD1FF051345AC9B00AF11D1 /* slot2_guitarGrip.cpp */, @@ -2190,12 +2195,12 @@ files = ( ABD1FF531345ACBF00AF11D1 /* ConvertUTF.c in Sources */, ABAD3E7113AF1D6D00502E1E /* AAFilter.cpp in Sources */, - ABD1FED01345AC8400AF11D1 /* addons.cpp in Sources */, ABD1FED21345AC8400AF11D1 /* arm_instructions.cpp in Sources */, ABD1FED31345AC8400AF11D1 /* armcpu.cpp in Sources */, ABD1FED41345AC8400AF11D1 /* bios.cpp in Sources */, ABD1FF5B1345ACBF00AF11D1 /* cache.cpp in Sources */, ABD1FED51345AC8400AF11D1 /* cheatSystem.cpp in Sources */, + AB29B16718313C14009B7982 /* slot2_auto.cpp in Sources */, ABD1FED71345AC8400AF11D1 /* common.cpp in Sources */, ABD1FED81345AC8400AF11D1 /* cp15.cpp in Sources */, AB15CA7214A29EE500B8A6A4 /* cpu_detect_x86_gcc.cpp in Sources */, @@ -2235,6 +2240,7 @@ ABD1FEED1345AC8400AF11D1 /* MMU.cpp in Sources */, ABAD3E7613AF1D6D00502E1E /* mmx_optimized.cpp in Sources */, ABD1FEEE1345AC8400AF11D1 /* movie.cpp in Sources */, + AB29B16318313AF5009B7982 /* slot2.cpp in Sources */, ABD1FEEF1345AC8400AF11D1 /* NDSSystem.cpp in Sources */, ABD1FF651345ACBF00AF11D1 /* partition.cpp in Sources */, ABD1FEF11345AC8400AF11D1 /* path.cpp in Sources */, @@ -2361,7 +2367,6 @@ files = ( AB796CEF15CDCBA200C59155 /* ConvertUTF.c in Sources */, AB796CF015CDCBA200C59155 /* AAFilter.cpp in Sources */, - AB796CF115CDCBA200C59155 /* addons.cpp in Sources */, AB796CF215CDCBA200C59155 /* arm_instructions.cpp in Sources */, AB796CF315CDCBA200C59155 /* armcpu.cpp in Sources */, AB796CF415CDCBA200C59155 /* bios.cpp in Sources */, @@ -2379,6 +2384,7 @@ AB796CFE15CDCBA200C59155 /* directory.cpp in Sources */, AB796CFF15CDCBA200C59155 /* Disassembler.cpp in Sources */, AB796D0015CDCBA200C59155 /* disc.cpp in Sources */, + AB29B16218313AF5009B7982 /* slot2.cpp in Sources */, AB796D0115CDCBA200C59155 /* dlditool.cpp in Sources */, AB796D0215CDCBA200C59155 /* driver.cpp in Sources */, AB796D0315CDCBA200C59155 /* emufat.cpp in Sources */, @@ -2474,6 +2480,7 @@ AB796D5D15CDCBA200C59155 /* epx.cpp in Sources */, AB796D5E15CDCBA200C59155 /* hq2x.cpp in Sources */, AB796D5F15CDCBA200C59155 /* hq4x.cpp in Sources */, + AB29B16618313C14009B7982 /* slot2_auto.cpp in Sources */, ABCFA9F4178BDE920030C8BA /* encrypt.cpp in Sources */, AB796D6015CDCBA200C59155 /* lq2x.cpp in Sources */, AB796D6115CDCBA200C59155 /* scanline.cpp in Sources */, @@ -2535,9 +2542,11 @@ ABB3C6701501C04F00E0C22E /* videofilter.cpp in Sources */, ABB3C6721501C04F00E0C22E /* cocoa_file.mm in Sources */, ABB3C6751501C04F00E0C22E /* cocoa_rom.mm in Sources */, + AB29B16418313AF5009B7982 /* slot2.cpp in Sources */, ABB3C6761501C04F00E0C22E /* cocoa_util.mm in Sources */, ABB3C6771501C04F00E0C22E /* cocoa_videofilter.mm in Sources */, ABB3C6781501C04F00E0C22E /* slot1_none.cpp in Sources */, + AB29B16818313C14009B7982 /* slot2_auto.cpp in Sources */, AB9038B417C5ED2200F410BD /* slot1_retail_mcrom.cpp in Sources */, ABB3C6791501C04F00E0C22E /* slot1_r4.cpp in Sources */, ABB3C67A1501C04F00E0C22E /* slot1_retail_nand.cpp in Sources */, @@ -2600,7 +2609,6 @@ ABB3C6B01501C04F00E0C22E /* task.cpp in Sources */, ABB3C6B11501C04F00E0C22E /* vfat.cpp in Sources */, ABB3C6B21501C04F00E0C22E /* xstring.cpp in Sources */, - ABB3C6B31501C04F00E0C22E /* addons.cpp in Sources */, ABB3C6B41501C04F00E0C22E /* arm_instructions.cpp in Sources */, ABB3C6B51501C04F00E0C22E /* armcpu.cpp in Sources */, ABB3C6B61501C04F00E0C22E /* bios.cpp in Sources */, diff --git a/desmume/src/cocoa/cocoa_core.mm b/desmume/src/cocoa/cocoa_core.mm index e261e8b66..3fda30c9a 100644 --- a/desmume/src/cocoa/cocoa_core.mm +++ b/desmume/src/cocoa/cocoa_core.mm @@ -28,9 +28,9 @@ #include #include -#include "../addons.h" #include "../NDSSystem.h" #include "../slot1.h" +#include "../slot2.h" #undef BOOL @@ -187,7 +187,7 @@ static BOOL isCoreStarted = NO; return isCoreStarted; } - addonsChangePak(NDS_ADDON_NONE); + slot2_Change(NDS_SLOT2_NONE); result = NDS_Init(); if (result == -1)