ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/stella-emu/stella

This commit is contained in:
thrust26 2020-05-25 00:18:14 +02:00
parent 557447775b de655c11e6
commit 1092729ae3
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/macos/stella.xcodeproj/project.pbxproj
View File

@ -407,6 +407,10 @@
DC8078DB0B4BD5F3005E9305 /* DebuggerExpressions.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC8078DA0B4BD5F3005E9305 /* DebuggerExpressions.hxx */; };
DC8078EA0B4BD697005E9305 /* UIDialog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC8078E60B4BD697005E9305 /* UIDialog.cxx */; };
DC8078EB0B4BD697005E9305 /* UIDialog.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC8078E70B4BD697005E9305 /* UIDialog.hxx */; };
DC84397B247B294E00C6A4FC /* CartTVBoy.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC843979247B294D00C6A4FC /* CartTVBoy.hxx */; };
DC84397C247B294E00C6A4FC /* CartTVBoy.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC84397A247B294D00C6A4FC /* CartTVBoy.cxx */; };
DC84397F247B297A00C6A4FC /* CartTVBoyWidget.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC84397D247B297A00C6A4FC /* CartTVBoyWidget.hxx */; };
DC843980247B297A00C6A4FC /* CartTVBoyWidget.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC84397E247B297A00C6A4FC /* CartTVBoyWidget.cxx */; };
DC8C1BAD14B25DE7006440EE /* CartCM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC8C1BA714B25DE7006440EE /* CartCM.cxx */; };
DC8C1BAE14B25DE7006440EE /* CartCM.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC8C1BA814B25DE7006440EE /* CartCM.hxx */; };
DC8C1BAF14B25DE7006440EE /* CompuMate.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC8C1BA914B25DE7006440EE /* CompuMate.cxx */; };
@ -700,6 +704,8 @@
isa = PBXBuildRule;
compilerSpec = com.apple.compilers.llvm.clang.1_0;
fileType = sourcecode.c;
inputFiles = (
);
isEditable = 1;
outputFiles = (
);
@ -709,6 +715,8 @@
isa = PBXBuildRule;
compilerSpec = com.apple.compilers.llvm.clang.1_0;
fileType = sourcecode.asm;
inputFiles = (
);
isEditable = 1;
outputFiles = (
);
@ -718,6 +726,8 @@
isa = PBXBuildRule;
compilerSpec = com.apple.compilers.llvm.clang.1_0;
fileType = sourcecode.cpp;
inputFiles = (
);
isEditable = 1;
outputFiles = (
);
@ -1146,6 +1156,10 @@
DC8078DA0B4BD5F3005E9305 /* DebuggerExpressions.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = DebuggerExpressions.hxx; sourceTree = "<group>"; };
DC8078E60B4BD697005E9305 /* UIDialog.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = UIDialog.cxx; sourceTree = "<group>"; };
DC8078E70B4BD697005E9305 /* UIDialog.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = UIDialog.hxx; sourceTree = "<group>"; };
DC843979247B294D00C6A4FC /* CartTVBoy.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartTVBoy.hxx; sourceTree = "<group>"; };
DC84397A247B294D00C6A4FC /* CartTVBoy.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CartTVBoy.cxx; sourceTree = "<group>"; };
DC84397D247B297A00C6A4FC /* CartTVBoyWidget.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartTVBoyWidget.hxx; sourceTree = "<group>"; };
DC84397E247B297A00C6A4FC /* CartTVBoyWidget.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CartTVBoyWidget.cxx; sourceTree = "<group>"; };
DC8C1BA714B25DE7006440EE /* CartCM.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CartCM.cxx; sourceTree = "<group>"; };
DC8C1BA814B25DE7006440EE /* CartCM.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartCM.hxx; sourceTree = "<group>"; };
DC8C1BA914B25DE7006440EE /* CompuMate.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CompuMate.cxx; sourceTree = "<group>"; };
@ -1643,6 +1657,8 @@
DC2AADB3194F390F0026C7A4 /* CartRamWidget.hxx */,
DC676A3D1729A0B000E4E73D /* CartSBWidget.cxx */,
DC676A3E1729A0B000E4E73D /* CartSBWidget.hxx */,
DC84397E247B297A00C6A4FC /* CartTVBoyWidget.cxx */,
DC84397D247B297A00C6A4FC /* CartTVBoyWidget.hxx */,
DCAAE5D11715887B0080BB82 /* CartUAWidget.cxx */,
DCAAE5D21715887B0080BB82 /* CartUAWidget.hxx */,
DC6D39851A3CE65000171E71 /* CartWDWidget.cxx */,
@ -1902,6 +1918,8 @@
DC71EA9C1FDA06D2008827CB /* CartMNetwork.hxx */,
DC0984830D3985160073C852 /* CartSB.cxx */,
DC0984840D3985160073C852 /* CartSB.hxx */,
DC84397A247B294D00C6A4FC /* CartTVBoy.cxx */,
DC843979247B294D00C6A4FC /* CartTVBoy.hxx */,
2DDBEB7008457B7D00812C11 /* CartUA.cxx */,
2DDBEB7108457B7D00812C11 /* CartUA.hxx */,
DCDA03AE1A2009BA00711920 /* CartWD.cxx */,
@ -2362,6 +2380,7 @@
2D9173CF09BA90380026E9FF /* Cart3F.hxx in Headers */,
DC3EE86D1E2C0E6D00905161 /* zlib.h in Headers */,
E08FCD5523A037EB0051F59B /* Blitter.hxx in Headers */,
DC84397F247B297A00C6A4FC /* CartTVBoyWidget.hxx in Headers */,
E034A5EF209FB25D00C89E9E /* EmulationTiming.hxx in Headers */,
DC3EE86A1E2C0E6D00905161 /* trees.h in Headers */,
2D9173D009BA90380026E9FF /* Cart4K.hxx in Headers */,
@ -2696,6 +2715,7 @@
DCAACAFB188D631500A4D282 /* CartBFSC.hxx in Headers */,
DCAACAFD188D631500A4D282 /* CartDF.hxx in Headers */,
DCAACAFF188D631500A4D282 /* CartDFSC.hxx in Headers */,
DC84397B247B294E00C6A4FC /* CartTVBoy.hxx in Headers */,
DCAACB0F188D636F00A4D282 /* Cart4KSCWidget.hxx in Headers */,
DCAACB11188D636F00A4D282 /* CartBFSCWidget.hxx in Headers */,
DCA82C741FEB4E780059340F /* TimeMachineDialog.hxx in Headers */,
@ -2833,6 +2853,7 @@
2D91747D09BA90380026E9FF /* CartE0.cxx in Sources */,
DCF8621921C9D43300F95F52 /* StaggeredLogger.cxx in Sources */,
E0DCD3AA20A64E96000B614E /* ConvolutionBuffer.cxx in Sources */,
DC843980247B297A00C6A4FC /* CartTVBoyWidget.cxx in Sources */,
2D91747E09BA90380026E9FF /* CartE7.cxx in Sources */,
DC9616321F817830008A2206 /* PointingDeviceWidget.cxx in Sources */,
2D91747F09BA90380026E9FF /* CartF4.cxx in Sources */,
@ -3068,6 +3089,7 @@
DCDA03B01A2009BB00711920 /* CartWD.cxx in Sources */,
DCC6A4B220A2622500863C59 /* SimpleResampler.cxx in Sources */,
DC21E5BF21CA903E007D0E1A /* OSystemMACOS.cxx in Sources */,
DC84397C247B294E00C6A4FC /* CartTVBoy.cxx in Sources */,
DCAAE5D91715887B0080BB82 /* Cart0840Widget.cxx in Sources */,
DCAAE5DB1715887B0080BB82 /* CartCVWidget.cxx in Sources */,
DCA233B423BAB1300032ABF3 /* Lightgun.cxx in Sources */,