Skip to content

Commit

Permalink
Merge branch 'TASEmulators:master' into slidecontroller
Browse files Browse the repository at this point in the history
  • Loading branch information
@windwakr
windwakr authored Oct 10, 2023
2 parents 2a47307 + b06537c commit f4cfc54
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 2 deletions.
24 changes: 24 additions & 0 deletions desmume/src/frontend/cocoa/DeSmuME (Latest).xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2446,6 +2446,17 @@
AB8493C01B4E614D00CD1C73 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = AB8493AD1B4E614D00CD1C73 /* [email protected] */; };
AB8493C11B4E614D00CD1C73 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = AB8493AE1B4E614D00CD1C73 /* [email protected] */; };
AB8493C31B4E614D00CD1C73 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = AB8493AE1B4E614D00CD1C73 /* [email protected] */; };
AB8800542AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB8800532AD5EC4F0090D47F /* slot2_hcv1000.cpp */; };
AB8800552AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB8800532AD5EC4F0090D47F /* slot2_hcv1000.cpp */; };
AB8800562AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB8800532AD5EC4F0090D47F /* slot2_hcv1000.cpp */; };
AB8800572AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB8800532AD5EC4F0090D47F /* slot2_hcv1000.cpp */; };
AB8800582AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB8800532AD5EC4F0090D47F /* slot2_hcv1000.cpp */; };
AB8800592AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB8800532AD5EC4F0090D47F /* slot2_hcv1000.cpp */; };
AB88005A2AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB8800532AD5EC4F0090D47F /* slot2_hcv1000.cpp */; };
AB88005B2AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB8800532AD5EC4F0090D47F /* slot2_hcv1000.cpp */; };
AB88005C2AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB8800532AD5EC4F0090D47F /* slot2_hcv1000.cpp */; };
AB88005D2AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB8800532AD5EC4F0090D47F /* slot2_hcv1000.cpp */; };
AB88005E2AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB8800532AD5EC4F0090D47F /* slot2_hcv1000.cpp */; };
AB8967D916D2ED0700F826F1 /* DisplayWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB8967D816D2ED0700F826F1 /* DisplayWindowController.mm */; };
AB8967DD16D2ED2700F826F1 /* DisplayWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB8967DB16D2ED2700F826F1 /* DisplayWindow.xib */; };
AB8B7AAC17CE8C440051CEBF /* slot1comp_protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB8B7AAB17CE8C440051CEBF /* slot1comp_protocol.cpp */; };
Expand Down Expand Up @@ -4062,6 +4073,7 @@
AB8493AC1B4E614D00CD1C73 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "images/[email protected]"; sourceTree = "<group>"; };
AB8493AD1B4E614D00CD1C73 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "images/[email protected]"; sourceTree = "<group>"; };
AB8493AE1B4E614D00CD1C73 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "images/[email protected]"; sourceTree = "<group>"; };
AB8800532AD5EC4F0090D47F /* slot2_hcv1000.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot2_hcv1000.cpp; sourceTree = "<group>"; };
AB8967D716D2ED0700F826F1 /* DisplayWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DisplayWindowController.h; sourceTree = "<group>"; };
AB8967D816D2ED0700F826F1 /* DisplayWindowController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DisplayWindowController.mm; sourceTree = "<group>"; };
AB8967DC16D2ED2700F826F1 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = translations/English.lproj/DisplayWindow.xib; sourceTree = "<group>"; };
Expand Down Expand Up @@ -5765,6 +5777,7 @@
ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */,
ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */,
ABD1FF051345AC9B00AF11D1 /* slot2_guitarGrip.cpp */,
AB8800532AD5EC4F0090D47F /* slot2_hcv1000.cpp */,
ABD1FF061345AC9B00AF11D1 /* slot2_mpcf.cpp */,
ABD1FF071345AC9C00AF11D1 /* slot2_none.cpp */,
ABD1FF081345AC9C00AF11D1 /* slot2_paddle.cpp */,
Expand Down Expand Up @@ -8064,6 +8077,7 @@
8C43E86627E3CD0100A35F65 /* ftfstype.c in Sources */,
8C43E86B27E3CD0100A35F65 /* macosx_10_5_compat.cpp in Sources */,
8C43E86C27E3CD0100A35F65 /* retro_dirent.c in Sources */,
AB8800562AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */,
8C43E87427E3CD0100A35F65 /* slot2_passme.cpp in Sources */,
8C43E87727E3CD0100A35F65 /* psnames.c in Sources */,
8C43E87827E3CD0100A35F65 /* ftotval.c in Sources */,
Expand Down Expand Up @@ -8128,6 +8142,7 @@
8C43E92F27E3CD4C00A35F65 /* common.cpp in Sources */,
8C43E93027E3CD4C00A35F65 /* cp15.cpp in Sources */,
8C43E93127E3CD4C00A35F65 /* psaux.c in Sources */,
AB8800572AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */,
8C43E93227E3CD4C00A35F65 /* cpu_detect_x86_gcc.cpp in Sources */,
8C43E93327E3CD4C00A35F65 /* crc.cpp in Sources */,
8C43E93427E3CD4C00A35F65 /* MacOGLDisplayView.mm in Sources */,
Expand Down Expand Up @@ -8465,6 +8480,7 @@
8CCD84DF27E40B730024BDD5 /* type1cid.c in Sources */,
8CCD84E427E40B730024BDD5 /* cocoa_slot2.mm in Sources */,
8CCD84E627E40B730024BDD5 /* ftbase.c in Sources */,
AB88005D2AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */,
8CCD84EA27E40B730024BDD5 /* fsnitro.cpp in Sources */,
8CCD84EB27E40B730024BDD5 /* macosx_10_5_compat.cpp in Sources */,
8CCD84EC27E40B730024BDD5 /* OGLRender_3_2.cpp in Sources */,
Expand Down Expand Up @@ -8509,6 +8525,7 @@
AB36C7AF27F2C8AE00C763C8 /* decrypt.cpp in Sources */,
AB36C7B027F2C8AE00C763C8 /* directory.cpp in Sources */,
AB36C7B127F2C8AE00C763C8 /* Disassembler.cpp in Sources */,
AB88005A2AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */,
AB36C7B227F2C8AE00C763C8 /* disc.cpp in Sources */,
AB36C7B327F2C8AE00C763C8 /* dlditool.cpp in Sources */,
AB36C7B427F2C8AE00C763C8 /* driver.cpp in Sources */,
Expand Down Expand Up @@ -8884,6 +8901,7 @@
AB7900EF215B84E50082AE82 /* coreaudiosound.cpp in Sources */,
AB7900F0215B84E50082AE82 /* ringbuffer.cpp in Sources */,
AB7900F1215B84E50082AE82 /* arm_jit.cpp in Sources */,
AB8800582AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */,
AB7900F2215B84E50082AE82 /* smooth.c in Sources */,
AB7900F3215B84E50082AE82 /* troubleshootingWindowDelegate.mm in Sources */,
AB7900F4215B84E50082AE82 /* macOS_driver.cpp in Sources */,
Expand Down Expand Up @@ -9000,6 +9018,7 @@
AB7901DD215B84F20082AE82 /* driver.cpp in Sources */,
AB7901DE215B84F20082AE82 /* emufat.cpp in Sources */,
AB7901DF215B84F20082AE82 /* type1cid.c in Sources */,
AB8800592AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */,
AB7901E0215B84F20082AE82 /* emufile.cpp in Sources */,
AB7901E1215B84F20082AE82 /* fatdir.cpp in Sources */,
AB7901E2215B84F20082AE82 /* fatfile.cpp in Sources */,
Expand Down Expand Up @@ -9343,6 +9362,7 @@
AB796D6215CDCBA200C59155 /* coreaudiosound.cpp in Sources */,
AB796D6315CDCBA200C59155 /* ringbuffer.cpp in Sources */,
AB796D6415CDCBA200C59155 /* arm_jit.cpp in Sources */,
AB8800542AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */,
ABFEA8CA1BB4EC1100B08C25 /* smooth.c in Sources */,
ABF2B9FB16904133000FF7C0 /* troubleshootingWindowDelegate.mm in Sources */,
AB28625920AE3E9F00EAED43 /* macOS_driver.cpp in Sources */,
Expand Down Expand Up @@ -9459,6 +9479,7 @@
AB8F3C871A53AC2600A80BF6 /* driver.cpp in Sources */,
AB8F3C881A53AC2600A80BF6 /* emufat.cpp in Sources */,
ABA7316A1BB51FDC00B26147 /* type1cid.c in Sources */,
AB8800552AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */,
AB8F3C891A53AC2600A80BF6 /* emufile.cpp in Sources */,
AB8F3C8A1A53AC2600A80BF6 /* fatdir.cpp in Sources */,
AB8F3C8B1A53AC2600A80BF6 /* fatfile.cpp in Sources */,
Expand Down Expand Up @@ -9763,6 +9784,7 @@
AB2ABA461C9F9CFA00173B15 /* rthreads.c in Sources */,
ABB3C6CB1501C04F00E0C22E /* rasterize.cpp in Sources */,
ABB3C6CC1501C04F00E0C22E /* readwrite.cpp in Sources */,
AB88005E2AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */,
AB49B553281687B90069F1D7 /* truetype.c in Sources */,
ABB3C6CD1501C04F00E0C22E /* render3D.cpp in Sources */,
ABB3C6CE1501C04F00E0C22E /* ROMReader.cpp in Sources */,
Expand Down Expand Up @@ -9974,6 +9996,7 @@
ABC8594228273FEE00A03EA9 /* buffer.cpp in Sources */,
ABC8594328273FEE00A03EA9 /* ftotval.c in Sources */,
ABC8594428273FEE00A03EA9 /* compiler.cpp in Sources */,
AB88005B2AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */,
ABC8594528273FEE00A03EA9 /* compilercontext.cpp in Sources */,
ABC8594628273FEE00A03EA9 /* rthreads.c in Sources */,
ABC8594728273FEE00A03EA9 /* macOS_driver.cpp in Sources */,
Expand Down Expand Up @@ -10203,6 +10226,7 @@
ABD2CDF626E05CB000FB15F7 /* buffer.cpp in Sources */,
ABD2CDF726E05CB000FB15F7 /* ftotval.c in Sources */,
ABD2CDF826E05CB000FB15F7 /* compiler.cpp in Sources */,
AB88005C2AD5EC500090D47F /* slot2_hcv1000.cpp in Sources */,
ABD2CDF926E05CB000FB15F7 /* compilercontext.cpp in Sources */,
ABD2CDFA26E05CB000FB15F7 /* rthreads.c in Sources */,
ABD2CDFB26E05CB000FB15F7 /* macOS_driver.cpp in Sources */,
Expand Down
16 changes: 14 additions & 2 deletions desmume/src/frontend/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,11 @@
AB142028186E2CD80015D52F /* Image_MemoryExpansionPak.png in Resources */ = {isa = PBXBuildFile; fileRef = AB142025186E2CD80015D52F /* Image_MemoryExpansionPak.png */; };
AB142029186E2CD80015D52F /* Image_MemoryExpansionPak.png in Resources */ = {isa = PBXBuildFile; fileRef = AB142025186E2CD80015D52F /* Image_MemoryExpansionPak.png */; };
AB14202A186E2CD80015D52F /* Image_MemoryExpansionPak.png in Resources */ = {isa = PBXBuildFile; fileRef = AB142025186E2CD80015D52F /* Image_MemoryExpansionPak.png */; };
AB1B20AC2AD5ED59007CA7EB /* slot2_hcv1000.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB1B20AB2AD5ED59007CA7EB /* slot2_hcv1000.cpp */; };
AB1B20AD2AD5ED59007CA7EB /* slot2_hcv1000.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB1B20AB2AD5ED59007CA7EB /* slot2_hcv1000.cpp */; };
AB1B20AE2AD5ED59007CA7EB /* slot2_hcv1000.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB1B20AB2AD5ED59007CA7EB /* slot2_hcv1000.cpp */; };
AB1B20AF2AD5ED59007CA7EB /* slot2_hcv1000.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB1B20AB2AD5ED59007CA7EB /* slot2_hcv1000.cpp */; };
AB1B20B02AD5ED59007CA7EB /* slot2_hcv1000.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB1B20AB2AD5ED59007CA7EB /* slot2_hcv1000.cpp */; };
AB1CC8001AA509C2008B0A16 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB1CC7FF1AA509C2008B0A16 /* CoreAudio.framework */; };
AB1CC80A1AA509DF008B0A16 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB1CC7FF1AA509C2008B0A16 /* CoreAudio.framework */; };
AB1CC80B1AA509E0008B0A16 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB1CC7FF1AA509C2008B0A16 /* CoreAudio.framework */; };
Expand Down Expand Up @@ -1915,6 +1920,7 @@
AB0F29A514BE7213009ABC6F /* Icon_Speaker_420x420.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_Speaker_420x420.png; path = images/Icon_Speaker_420x420.png; sourceTree = "<group>"; };
AB126D06182ECB9500EBCF22 /* slot2_passme.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot2_passme.cpp; sourceTree = "<group>"; };
AB142025186E2CD80015D52F /* Image_MemoryExpansionPak.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Image_MemoryExpansionPak.png; path = images/Image_MemoryExpansionPak.png; sourceTree = "<group>"; };
AB1B20AB2AD5ED59007CA7EB /* slot2_hcv1000.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot2_hcv1000.cpp; sourceTree = "<group>"; };
AB1CC7FF1AA509C2008B0A16 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
AB1CC8161AA50C8D008B0A16 /* Icon_MicrophoneBlack_256x256.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_MicrophoneBlack_256x256.png; path = images/Icon_MicrophoneBlack_256x256.png; sourceTree = "<group>"; };
AB1CC8171AA50C8D008B0A16 /* Icon_MicrophoneBlueGlow_256x256.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_MicrophoneBlueGlow_256x256.png; path = images/Icon_MicrophoneBlueGlow_256x256.png; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3511,6 +3517,7 @@
ABD1FF031345AC9B00AF11D1 /* slot2_expMemory.cpp */,
ABD1FF041345AC9B00AF11D1 /* slot2_gbagame.cpp */,
ABD1FF051345AC9B00AF11D1 /* slot2_guitarGrip.cpp */,
AB1B20AB2AD5ED59007CA7EB /* slot2_hcv1000.cpp */,
ABD1FF061345AC9B00AF11D1 /* slot2_mpcf.cpp */,
ABD1FF071345AC9C00AF11D1 /* slot2_none.cpp */,
ABD1FF081345AC9C00AF11D1 /* slot2_paddle.cpp */,
Expand Down Expand Up @@ -3886,7 +3893,7 @@
attributes = {
ORGANIZATIONNAME = "DeSmuME Team";
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DeSmuME (XCode 3)" */;
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DeSmuME (Xcode 3)" */;
compatibilityVersion = "Xcode 3.1";
developmentRegion = English;
hasScannedForEncodings = 1;
Expand Down Expand Up @@ -4857,6 +4864,7 @@
ABD1267820AE812900EFE1B2 /* macOS_driver.cpp in Sources */,
AB4B5A22217E47E400381363 /* WifiSettingsPanel.mm in Sources */,
ABEBCE382A703E260028CE8A /* CheatDatabaseWindowController.mm in Sources */,
AB1B20AD2AD5ED59007CA7EB /* slot2_hcv1000.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -5052,6 +5060,7 @@
ABD1267A20AE812900EFE1B2 /* macOS_driver.cpp in Sources */,
AB4B5A23217E47E400381363 /* WifiSettingsPanel.mm in Sources */,
ABEBCE392A703E260028CE8A /* CheatDatabaseWindowController.mm in Sources */,
AB1B20AE2AD5ED59007CA7EB /* slot2_hcv1000.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -5277,6 +5286,7 @@
ABD1267620AE812900EFE1B2 /* macOS_driver.cpp in Sources */,
AB4B5A21217E47E400381363 /* WifiSettingsPanel.mm in Sources */,
ABEBCE372A703E260028CE8A /* CheatDatabaseWindowController.mm in Sources */,
AB1B20AC2AD5ED59007CA7EB /* slot2_hcv1000.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -5502,6 +5512,7 @@
ABD1267E20AE812900EFE1B2 /* macOS_driver.cpp in Sources */,
AB4B5A25217E47E400381363 /* WifiSettingsPanel.mm in Sources */,
ABEBCE3B2A703E260028CE8A /* CheatDatabaseWindowController.mm in Sources */,
AB1B20B02AD5ED59007CA7EB /* slot2_hcv1000.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -5697,6 +5708,7 @@
ABD1267C20AE812900EFE1B2 /* macOS_driver.cpp in Sources */,
AB4B5A24217E47E400381363 /* WifiSettingsPanel.mm in Sources */,
ABEBCE3A2A703E260028CE8A /* CheatDatabaseWindowController.mm in Sources */,
AB1B20AF2AD5ED59007CA7EB /* slot2_hcv1000.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -6041,7 +6053,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DeSmuME (XCode 3)" */ = {
C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DeSmuME (Xcode 3)" */ = {
isa = XCConfigurationList;
buildConfigurations = (
C01FCF4F08A954540054247B /* Debug */,
Expand Down

0 comments on commit f4cfc54

Please sign in to comment.