From e62995291af103353b0623dd49169f3e9ae0d396 Mon Sep 17 00:00:00 2001 From: rogerman Date: Wed, 28 Aug 2013 23:08:51 +0000 Subject: [PATCH] Cocoa Port: - Fix building for all Xcode projects. (Regression from r4731). Core: - Fix include path in slot1comp_protocol.cpp. (Regression from r4731). - Remove strongly-typed enum in MMU.h for compilers configured to build for (or can only support) C99. (Regression from r4731). --- desmume/src/MMU.h | 2 +- desmume/src/addons/slot1comp_protocol.cpp | 2 +- .../DeSmuME (Legacy).xcodeproj/project.pbxproj | 18 ++++++++++++++++++ .../project.pbxproj | 14 ++++++++++++++ .../project.pbxproj | 10 ++++++++++ .../project.pbxproj | 10 ++++++++++ 6 files changed, 54 insertions(+), 2 deletions(-) diff --git a/desmume/src/MMU.h b/desmume/src/MMU.h index 9085d95f2..baae1c5d0 100644 --- a/desmume/src/MMU.h +++ b/desmume/src/MMU.h @@ -296,7 +296,7 @@ public: }; -enum eCardMode : u32 +enum eCardMode { //when the GC system is first booted up, the protocol is in raw mode eCardMode_RAW = 0, diff --git a/desmume/src/addons/slot1comp_protocol.cpp b/desmume/src/addons/slot1comp_protocol.cpp index 480781fdb..02d91882b 100644 --- a/desmume/src/addons/slot1comp_protocol.cpp +++ b/desmume/src/addons/slot1comp_protocol.cpp @@ -19,7 +19,7 @@ #include "MMU.h" #include "armcpu.h" #include "encrypt.h" -#include "utils/decrypt/decrypt.h" +#include "../utils/decrypt/decrypt.h" static _KEY1 key1((const u8*)arm7_key); diff --git a/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj b/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj index b0b20eb9e..ffdbc3942 100644 --- a/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj +++ b/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj @@ -851,6 +851,13 @@ 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 */; }; + 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 */; }; + ABB9215D17CEB53A0049D4C5 /* slot1comp_protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB9215917CEB53A0049D4C5 /* slot1comp_protocol.cpp */; }; + ABB9215E17CEB53A0049D4C5 /* slot1comp_protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB9215917CEB53A0049D4C5 /* slot1comp_protocol.cpp */; }; + ABB9215F17CEB53A0049D4C5 /* slot1comp_protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB9215917CEB53A0049D4C5 /* slot1comp_protocol.cpp */; }; + ABB9216017CEB53A0049D4C5 /* slot1comp_protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB9215917CEB53A0049D4C5 /* slot1comp_protocol.cpp */; }; ABBF053014B5436E00E505A0 /* cocoa_file.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABBF052F14B5436E00E505A0 /* cocoa_file.mm */; }; ABBF053114B5436E00E505A0 /* cocoa_file.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABBF052F14B5436E00E505A0 /* cocoa_file.mm */; }; ABBF053214B5436E00E505A0 /* cocoa_file.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABBF052F14B5436E00E505A0 /* cocoa_file.mm */; }; @@ -1382,6 +1389,8 @@ 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 = ""; }; + 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 = ""; }; ABBF04CB14B51BBB00E505A0 /* Chinese */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Chinese; path = translations/Chinese.lproj/Localizable.strings; sourceTree = ""; }; ABBF04CC14B51BC300E505A0 /* Norwegian */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Norwegian; path = translations/Norwegian.lproj/Localizable.strings; sourceTree = ""; }; @@ -1844,6 +1853,7 @@ AB4C80F017C5DA240024D479 /* slot1_retail_mcrom.cpp */, 956B96C213DF4CF900FCDCD0 /* slot1_retail_nand.cpp */, AB4C80F117C5DA240024D479 /* slot1comp_mc.cpp */, + ABB9215917CEB53A0049D4C5 /* slot1comp_protocol.cpp */, AB4C80F317C5DA240024D479 /* slot1comp_rom.cpp */, AB06CD9F135B8AED00E977B3 /* slot2_expMemory.cpp */, AB06CDA0135B8AED00E977B3 /* slot2_gbagame.cpp */, @@ -1854,6 +1864,7 @@ AB06CDA5135B8AED00E977B3 /* slot2_piano.cpp */, AB06CDA6135B8AED00E977B3 /* slot2_rumblepak.cpp */, AB4C80F217C5DA240024D479 /* slot1comp_mc.h */, + ABB9215817CEB53A0049D4C5 /* slot1comp_protocol.h */, AB4C80F417C5DA240024D479 /* slot1comp_rom.h */, ); name = addons; @@ -2929,6 +2940,7 @@ AB4C80FF17C5DA240024D479 /* slot1comp_mc.cpp in Sources */, AB4C810017C5DA240024D479 /* slot1comp_rom.cpp in Sources */, AB4C815B17C5DC240024D479 /* encrypt.cpp in Sources */, + ABB9215C17CEB53A0049D4C5 /* slot1comp_protocol.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3075,6 +3087,7 @@ AB4C810B17C5DA240024D479 /* slot1comp_mc.cpp in Sources */, AB4C810C17C5DA240024D479 /* slot1comp_rom.cpp in Sources */, AB4C815E17C5DC240024D479 /* encrypt.cpp in Sources */, + ABB9215F17CEB53A0049D4C5 /* slot1comp_protocol.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3221,6 +3234,7 @@ AB4C80F717C5DA240024D479 /* slot1comp_mc.cpp in Sources */, AB4C80F817C5DA240024D479 /* slot1comp_rom.cpp in Sources */, AB4C815917C5DC240024D479 /* encrypt.cpp in Sources */, + ABB9215A17CEB53A0049D4C5 /* slot1comp_protocol.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3337,6 +3351,7 @@ AB4C810717C5DA240024D479 /* slot1comp_mc.cpp in Sources */, AB4C810817C5DA240024D479 /* slot1comp_rom.cpp in Sources */, AB4C815D17C5DC240024D479 /* encrypt.cpp in Sources */, + ABB9215E17CEB53A0049D4C5 /* slot1comp_protocol.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3453,6 +3468,7 @@ AB4C810F17C5DA240024D479 /* slot1comp_mc.cpp in Sources */, AB4C811017C5DA240024D479 /* slot1comp_rom.cpp in Sources */, AB4C815F17C5DC240024D479 /* encrypt.cpp in Sources */, + ABB9216017CEB53A0049D4C5 /* slot1comp_protocol.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3579,6 +3595,7 @@ AB4C80FB17C5DA240024D479 /* slot1comp_mc.cpp in Sources */, AB4C80FC17C5DA240024D479 /* slot1comp_rom.cpp in Sources */, AB4C815A17C5DC240024D479 /* encrypt.cpp in Sources */, + ABB9215B17CEB53A0049D4C5 /* slot1comp_protocol.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3725,6 +3742,7 @@ AB4C810317C5DA240024D479 /* slot1comp_mc.cpp in Sources */, AB4C810417C5DA240024D479 /* slot1comp_rom.cpp in Sources */, AB4C815C17C5DC240024D479 /* encrypt.cpp in Sources */, + ABB9215D17CEB53A0049D4C5 /* slot1comp_protocol.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 f90016c2b..dddf5ba73 100644 --- a/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj +++ b/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj @@ -1042,6 +1042,11 @@ ABAD104415ACE7A00000EC47 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABC570D4134431DA00E7B0B1 /* OpenGL.framework */; }; ABAD104515ACE7A00000EC47 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AB0A0D1914AACA9600E83E91 /* libz.dylib */; }; ABB6AD5D173A3F2B00EC2E8D /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABB6AD5C173A3F2B00EC2E8D /* Carbon.framework */; }; + ABB9212117CEB4110049D4C5 /* slot1comp_protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB9212017CEB4110049D4C5 /* slot1comp_protocol.cpp */; }; + ABB9212217CEB4110049D4C5 /* slot1comp_protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB9212017CEB4110049D4C5 /* slot1comp_protocol.cpp */; }; + ABB9212317CEB4110049D4C5 /* slot1comp_protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB9212017CEB4110049D4C5 /* slot1comp_protocol.cpp */; }; + ABB9212417CEB4110049D4C5 /* slot1comp_protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB9212017CEB4110049D4C5 /* slot1comp_protocol.cpp */; }; + ABB9212517CEB4110049D4C5 /* slot1comp_protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB9212017CEB4110049D4C5 /* slot1comp_protocol.cpp */; }; ABBCE29715ACB1FF00A2C965 /* arm_jit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBCE29515ACB1FF00A2C965 /* arm_jit.cpp */; }; ABBCE29815ACB1FF00A2C965 /* arm_jit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBCE29515ACB1FF00A2C965 /* arm_jit.cpp */; }; ABBF04A614B515F300E505A0 /* AppIcon_ROMCheats.icns in Resources */ = {isa = PBXBuildFile; fileRef = ABBF04A414B515F300E505A0 /* AppIcon_ROMCheats.icns */; }; @@ -1268,6 +1273,8 @@ ABAAFBE9172122B6005DDDBE /* FileMigrationDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FileMigrationDelegate.mm; sourceTree = ""; }; ABAD104915ACE7A00000EC47 /* DeSmuME (PPC).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DeSmuME (PPC).app"; sourceTree = BUILT_PRODUCTS_DIR; }; ABB6AD5C173A3F2B00EC2E8D /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; }; + ABB9211F17CEB4110049D4C5 /* slot1comp_protocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slot1comp_protocol.h; sourceTree = ""; }; + ABB9212017CEB4110049D4C5 /* slot1comp_protocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1comp_protocol.cpp; sourceTree = ""; }; ABB97873144E89CC00793FA3 /* Icon_ActionReplay_32x32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_ActionReplay_32x32.png; path = Images/Icon_ActionReplay_32x32.png; sourceTree = ""; }; ABB97874144E89CC00793FA3 /* Icon_CodeBreaker_32x32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_CodeBreaker_32x32.png; path = Images/Icon_CodeBreaker_32x32.png; sourceTree = ""; }; ABB97875144E89CC00793FA3 /* Icon_DeSmuME_32x32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_DeSmuME_32x32.png; path = Images/Icon_DeSmuME_32x32.png; sourceTree = ""; }; @@ -2020,6 +2027,7 @@ AB4C808817C5D7780024D479 /* slot1_retail_mcrom.cpp */, AB6FBEF5139B6258007BB045 /* slot1_retail_nand.cpp */, AB4C808917C5D7780024D479 /* slot1comp_mc.cpp */, + ABB9212017CEB4110049D4C5 /* slot1comp_protocol.cpp */, AB4C808B17C5D7780024D479 /* slot1comp_rom.cpp */, ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */, ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */, @@ -2030,6 +2038,7 @@ ABD1FF091345AC9C00AF11D1 /* slot2_piano.cpp */, ABD1FF0A1345AC9C00AF11D1 /* slot2_rumblepak.cpp */, AB4C808A17C5D7780024D479 /* slot1comp_mc.h */, + ABB9211F17CEB4110049D4C5 /* slot1comp_protocol.h */, AB4C808C17C5D7780024D479 /* slot1comp_rom.h */, ); name = addons; @@ -3098,6 +3107,7 @@ AB4C809F17C5D7780024D479 /* slot1comp_mc.cpp in Sources */, AB4C80A017C5D7780024D479 /* slot1comp_rom.cpp in Sources */, AB4C80AE17C5D7A00024D479 /* advanscene.cpp in Sources */, + ABB9212517CEB4110049D4C5 /* slot1comp_protocol.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3233,6 +3243,7 @@ AB4C809317C5D7780024D479 /* slot1comp_mc.cpp in Sources */, AB4C809417C5D7780024D479 /* slot1comp_rom.cpp in Sources */, AB4C80AB17C5D7A00024D479 /* advanscene.cpp in Sources */, + ABB9212217CEB4110049D4C5 /* slot1comp_protocol.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3398,6 +3409,7 @@ AB4C808F17C5D7780024D479 /* slot1comp_mc.cpp in Sources */, AB4C809017C5D7780024D479 /* slot1comp_rom.cpp in Sources */, AB4C80AA17C5D7A00024D479 /* advanscene.cpp in Sources */, + ABB9212117CEB4110049D4C5 /* slot1comp_protocol.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3563,6 +3575,7 @@ AB4C809B17C5D7780024D479 /* slot1comp_mc.cpp in Sources */, AB4C809C17C5D7780024D479 /* slot1comp_rom.cpp in Sources */, AB4C80AD17C5D7A00024D479 /* advanscene.cpp in Sources */, + ABB9212417CEB4110049D4C5 /* slot1comp_protocol.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3698,6 +3711,7 @@ AB4C809717C5D7780024D479 /* slot1comp_mc.cpp in Sources */, AB4C809817C5D7780024D479 /* slot1comp_rom.cpp in Sources */, AB4C80AC17C5D7A00024D479 /* advanscene.cpp in Sources */, + ABB9212317CEB4110049D4C5 /* slot1comp_protocol.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 c143da3e5..dd1ac3729 100644 --- a/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj +++ b/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj @@ -627,6 +627,9 @@ ABEFCF64141AB82A000CC0CD /* AppIcon_SaveState.icns in Resources */ = {isa = PBXBuildFile; fileRef = ABEFCF60141AB82A000CC0CD /* AppIcon_SaveState.icns */; }; ABF2B9FB16904133000FF7C0 /* troubleshootingWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABF2B9FA16904133000FF7C0 /* troubleshootingWindowDelegate.mm */; }; ABF2B9FC16904133000FF7C0 /* troubleshootingWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABF2B9FA16904133000FF7C0 /* troubleshootingWindowDelegate.mm */; }; + ABF55C2817CEB38F00A193FD /* slot1comp_protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF55C2717CEB38F00A193FD /* slot1comp_protocol.cpp */; }; + ABF55C2917CEB38F00A193FD /* slot1comp_protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF55C2717CEB38F00A193FD /* slot1comp_protocol.cpp */; }; + ABF55C2A17CEB38F00A193FD /* slot1comp_protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF55C2717CEB38F00A193FD /* slot1comp_protocol.cpp */; }; ABFE150714C92FF5005D6699 /* 2xsai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE14FA14C92FF5005D6699 /* 2xsai.cpp */; }; ABFE150814C92FF5005D6699 /* bilinear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE14FB14C92FF5005D6699 /* bilinear.cpp */; }; ABFE150914C92FF5005D6699 /* epx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE14FC14C92FF5005D6699 /* epx.cpp */; }; @@ -1081,6 +1084,8 @@ ABEFCF60141AB82A000CC0CD /* AppIcon_SaveState.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = AppIcon_SaveState.icns; sourceTree = ""; }; ABF2B9F81690412A000FF7C0 /* troubleshootingWindowDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = troubleshootingWindowDelegate.h; sourceTree = ""; }; ABF2B9FA16904133000FF7C0 /* troubleshootingWindowDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = troubleshootingWindowDelegate.mm; sourceTree = ""; }; + ABF55C2617CEB38F00A193FD /* slot1comp_protocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slot1comp_protocol.h; sourceTree = ""; }; + ABF55C2717CEB38F00A193FD /* slot1comp_protocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1comp_protocol.cpp; sourceTree = ""; }; ABFE14FA14C92FF5005D6699 /* 2xsai.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = 2xsai.cpp; sourceTree = ""; }; ABFE14FB14C92FF5005D6699 /* bilinear.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bilinear.cpp; sourceTree = ""; }; ABFE14FC14C92FF5005D6699 /* epx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = epx.cpp; sourceTree = ""; }; @@ -1621,6 +1626,7 @@ ABFE7C8817C5D03C0028DC56 /* slot1_retail_mcrom.cpp */, AB6FBEF5139B6258007BB045 /* slot1_retail_nand.cpp */, ABFE7C8917C5D03C0028DC56 /* slot1comp_mc.cpp */, + ABF55C2717CEB38F00A193FD /* slot1comp_protocol.cpp */, ABFE7C8A17C5D03C0028DC56 /* slot1comp_rom.cpp */, ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */, ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */, @@ -1631,6 +1637,7 @@ ABD1FF091345AC9C00AF11D1 /* slot2_piano.cpp */, ABD1FF0A1345AC9C00AF11D1 /* slot2_rumblepak.cpp */, ABFE7C8517C5D03C0028DC56 /* slot1comp_mc.h */, + ABF55C2617CEB38F00A193FD /* slot1comp_protocol.h */, ABFE7C8617C5D03C0028DC56 /* slot1comp_rom.h */, ); name = addons; @@ -2324,6 +2331,7 @@ ABFE7C8F17C5D03C0028DC56 /* slot1_retail_mcrom.cpp in Sources */, ABFE7C9217C5D03C0028DC56 /* slot1comp_mc.cpp in Sources */, ABFE7C9517C5D03C0028DC56 /* slot1comp_rom.cpp in Sources */, + ABF55C2917CEB38F00A193FD /* slot1comp_protocol.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2490,6 +2498,7 @@ ABFE7C8E17C5D03C0028DC56 /* slot1_retail_mcrom.cpp in Sources */, ABFE7C9117C5D03C0028DC56 /* slot1comp_mc.cpp in Sources */, ABFE7C9417C5D03C0028DC56 /* slot1comp_rom.cpp in Sources */, + ABF55C2817CEB38F00A193FD /* slot1comp_protocol.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2645,6 +2654,7 @@ ABFE7C9017C5D03C0028DC56 /* slot1_retail_mcrom.cpp in Sources */, ABFE7C9317C5D03C0028DC56 /* slot1comp_mc.cpp in Sources */, ABFE7C9617C5D03C0028DC56 /* slot1comp_rom.cpp in Sources */, + ABF55C2A17CEB38F00A193FD /* slot1comp_protocol.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 20118b7ca..6b9d6293d 100644 --- a/desmume/src/cocoa/DeSmuME (Xcode 5).xcodeproj/project.pbxproj +++ b/desmume/src/cocoa/DeSmuME (Xcode 5).xcodeproj/project.pbxproj @@ -391,6 +391,9 @@ AB8967DA16D2ED0700F826F1 /* DisplayWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB8967D816D2ED0700F826F1 /* DisplayWindowController.mm */; }; AB8967DD16D2ED2700F826F1 /* DisplayWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB8967DB16D2ED2700F826F1 /* DisplayWindow.xib */; }; AB8967DE16D2ED2700F826F1 /* DisplayWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB8967DB16D2ED2700F826F1 /* DisplayWindow.xib */; }; + AB8B7AAC17CE8C440051CEBF /* slot1comp_protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB8B7AAB17CE8C440051CEBF /* slot1comp_protocol.cpp */; }; + AB8B7AAD17CE8C440051CEBF /* slot1comp_protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB8B7AAB17CE8C440051CEBF /* slot1comp_protocol.cpp */; }; + AB8B7AAE17CE8C440051CEBF /* slot1comp_protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB8B7AAB17CE8C440051CEBF /* slot1comp_protocol.cpp */; }; AB901BDE1420706100348EEC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = AB901BDD1420706100348EEC /* Localizable.strings */; }; AB9038A617C5ECFD00F410BD /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB9038A517C5ECFD00F410BD /* advanscene.cpp */; }; AB9038A717C5ECFD00F410BD /* advanscene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB9038A517C5ECFD00F410BD /* advanscene.cpp */; }; @@ -829,6 +832,8 @@ AB8967D716D2ED0700F826F1 /* DisplayWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DisplayWindowController.h; sourceTree = ""; }; AB8967D816D2ED0700F826F1 /* DisplayWindowController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DisplayWindowController.mm; sourceTree = ""; }; AB8967DC16D2ED2700F826F1 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = translations/English.lproj/DisplayWindow.xib; sourceTree = ""; }; + AB8B7AAA17CE8C440051CEBF /* slot1comp_protocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slot1comp_protocol.h; sourceTree = ""; }; + AB8B7AAB17CE8C440051CEBF /* slot1comp_protocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1comp_protocol.cpp; sourceTree = ""; }; AB901BDF1420706B00348EEC /* Japanese */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = Japanese; path = translations/Japanese.lproj/Localizable.strings; sourceTree = ""; }; AB901BE01420706F00348EEC /* French */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = French; path = translations/French.lproj/Localizable.strings; sourceTree = ""; }; AB901BE11420707400348EEC /* Italian */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = Italian; path = translations/Italian.lproj/Localizable.strings; sourceTree = ""; }; @@ -1621,6 +1626,7 @@ AB9038AA17C5ED2200F410BD /* slot1_retail_mcrom.cpp */, AB6FBEF5139B6258007BB045 /* slot1_retail_nand.cpp */, AB9038AB17C5ED2200F410BD /* slot1comp_mc.cpp */, + AB8B7AAB17CE8C440051CEBF /* slot1comp_protocol.cpp */, AB9038AD17C5ED2200F410BD /* slot1comp_rom.cpp */, ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */, ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */, @@ -1631,6 +1637,7 @@ ABD1FF091345AC9C00AF11D1 /* slot2_piano.cpp */, ABD1FF0A1345AC9C00AF11D1 /* slot2_rumblepak.cpp */, AB9038AC17C5ED2200F410BD /* slot1comp_mc.h */, + AB8B7AAA17CE8C440051CEBF /* slot1comp_protocol.h */, AB9038AE17C5ED2200F410BD /* slot1comp_rom.h */, ); name = addons; @@ -2267,6 +2274,7 @@ AB80E04D142BC4A800A52038 /* cocoa_util.mm in Sources */, ABE5DFE5143FB1DA00835AD8 /* cocoa_videofilter.mm in Sources */, AB0F291D14BE6F4A009ABC6F /* OGLRender.cpp in Sources */, + AB8B7AAD17CE8C440051CEBF /* slot1comp_protocol.cpp in Sources */, AB3ACB7214C2361100D7D192 /* appDelegate.mm in Sources */, AB3ACB7314C2361100D7D192 /* cheatWindowDelegate.mm in Sources */, AB3ACB7614C2361100D7D192 /* inputPrefsView.mm in Sources */, @@ -2485,6 +2493,7 @@ AB3A656116CC5438001F5D4A /* cocoa_GPU.mm in Sources */, AB8967D916D2ED0700F826F1 /* DisplayWindowController.mm in Sources */, AB29B33116D4BEBF000EF671 /* InputManager.mm in Sources */, + AB8B7AAC17CE8C440051CEBF /* slot1comp_protocol.cpp in Sources */, AB82445B1704AE9A00B8EE20 /* utilities.c in Sources */, AB01005E170D07B000D70FBE /* InputProfileController.mm in Sources */, ABD10AE71715FCDD00B5729D /* audiosamplegenerator.cpp in Sources */, @@ -2586,6 +2595,7 @@ ABB3C6C41501C04F00E0C22E /* mc.cpp in Sources */, ABB3C6C61501C04F00E0C22E /* MMU.cpp in Sources */, ABB3C6C71501C04F00E0C22E /* movie.cpp in Sources */, + AB8B7AAE17CE8C440051CEBF /* slot1comp_protocol.cpp in Sources */, ABB3C6C81501C04F00E0C22E /* NDSSystem.cpp in Sources */, ABB3C6C91501C04F00E0C22E /* OGLRender.cpp in Sources */, ABB3C6CA1501C04F00E0C22E /* path.cpp in Sources */,