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

Cocoa Port: 

- Fix Latest build. (Regression from r5070.)
This commit is contained in:
rogerman 2015-01-13 05:10:29 +00:00
parent 402434fe19
commit acc22b29cb
6 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
desmume/src/cocoa/DeSmuME (Latest).xcodeproj/project.pbxproj
View File

@ -1138,7 +1138,7 @@
AB405675169F5DCC0016AC3E /* x86operand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x86operand.h; sourceTree = "<group>"; }; AB405675169F5DCC0016AC3E /* x86operand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x86operand.h; sourceTree = "<group>"; };
AB405676169F5DCC0016AC3E /* x86util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = x86util.cpp; sourceTree = "<group>"; }; AB405676169F5DCC0016AC3E /* x86util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = x86util.cpp; sourceTree = "<group>"; };
AB405677169F5DCC0016AC3E /* x86util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x86util.h; sourceTree = "<group>"; }; AB405677169F5DCC0016AC3E /* x86util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x86util.h; sourceTree = "<group>"; };
AB407F391A620D6E00313213 /* DeSmuME (Xcode 5).profdata */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DeSmuME (Xcode 5).profdata"; sourceTree = "<group>"; }; AB407F391A620D6E00313213 /* DeSmuME (Latest).profdata */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DeSmuME (Latest).profdata"; sourceTree = "<group>"; };
AB47B52B18A3F722009A42AF /* xbrz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xbrz.h; sourceTree = "<group>"; }; AB47B52B18A3F722009A42AF /* xbrz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xbrz.h; sourceTree = "<group>"; };
AB47B52C18A3F722009A42AF /* xbrz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xbrz.cpp; sourceTree = "<group>"; }; AB47B52C18A3F722009A42AF /* xbrz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xbrz.cpp; sourceTree = "<group>"; };
AB4FCEBC1692AB82000F498F /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; }; AB4FCEBC1692AB82000F498F /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
@ -1183,12 +1183,6 @@
AB8B7AAA17CE8C440051CEBF /* slot1comp_protocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slot1comp_protocol.h; sourceTree = "<group>"; }; AB8B7AAA17CE8C440051CEBF /* slot1comp_protocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slot1comp_protocol.h; sourceTree = "<group>"; };
AB8B7AAB17CE8C440051CEBF /* slot1comp_protocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1comp_protocol.cpp; sourceTree = "<group>"; }; AB8B7AAB17CE8C440051CEBF /* slot1comp_protocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1comp_protocol.cpp; sourceTree = "<group>"; };
AB8F3D2E1A53AC2600A80BF6 /* DeSmuME (Debug, dev+).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DeSmuME (Debug, dev+).app"; sourceTree = BUILT_PRODUCTS_DIR; }; AB8F3D2E1A53AC2600A80BF6 /* DeSmuME (Debug, dev+).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DeSmuME (Debug, dev+).app"; sourceTree = BUILT_PRODUCTS_DIR; };
AB901BDF1420706B00348EEC /* Japanese */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = Japanese; path = translations/Japanese.lproj/Localizable.strings; sourceTree = "<group>"; };
AB901BE01420706F00348EEC /* French */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = French; path = translations/French.lproj/Localizable.strings; sourceTree = "<group>"; };
AB901BE11420707400348EEC /* Italian */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = Italian; path = translations/Italian.lproj/Localizable.strings; sourceTree = "<group>"; };
AB901BE21420707800348EEC /* Chinese */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = Chinese; path = translations/Chinese.lproj/Localizable.strings; sourceTree = "<group>"; };
AB901BE31420707D00348EEC /* Norwegian */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = Norwegian; path = translations/Norwegian.lproj/Localizable.strings; sourceTree = "<group>"; };
AB901BE41420708200348EEC /* Romanian */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = Romanian; path = translations/Romanian.lproj/Localizable.strings; sourceTree = "<group>"; };
AB9038A417C5ECFD00F410BD /* advanscene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = advanscene.h; sourceTree = "<group>"; }; AB9038A417C5ECFD00F410BD /* advanscene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = advanscene.h; sourceTree = "<group>"; };
AB9038A517C5ECFD00F410BD /* advanscene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = advanscene.cpp; sourceTree = "<group>"; }; AB9038A517C5ECFD00F410BD /* advanscene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = advanscene.cpp; sourceTree = "<group>"; };
AB9038A917C5ED2200F410BD /* slot1_retail_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_retail_auto.cpp; sourceTree = "<group>"; }; AB9038A917C5ED2200F410BD /* slot1_retail_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_retail_auto.cpp; sourceTree = "<group>"; };
@ -1785,7 +1779,7 @@
AB407F381A620D6E00313213 /* OptimizationProfiles */ = { AB407F381A620D6E00313213 /* OptimizationProfiles */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
AB407F391A620D6E00313213 /* DeSmuME (Xcode 5).profdata */, AB407F391A620D6E00313213 /* DeSmuME (Latest).profdata */,
); );
path = OptimizationProfiles; path = OptimizationProfiles;
sourceTree = "<group>"; sourceTree = "<group>";
@ -2315,7 +2309,7 @@
LastUpgradeCheck = 0460; LastUpgradeCheck = 0460;
ORGANIZATIONNAME = "DeSmuME Team"; ORGANIZATIONNAME = "DeSmuME Team";
}; };
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DeSmuME (Xcode 5)" */; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DeSmuME (Latest)" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
developmentRegion = English; developmentRegion = English;
hasScannedForEncodings = 1; hasScannedForEncodings = 1;
@ -3482,12 +3476,6 @@
isa = PBXVariantGroup; isa = PBXVariantGroup;
children = ( children = (
AB00E89114205ECC00DE561F /* English */, AB00E89114205ECC00DE561F /* English */,
AB901BE01420706F00348EEC /* French */,
AB901BE11420707400348EEC /* Italian */,
AB901BDF1420706B00348EEC /* Japanese */,
AB901BE21420707800348EEC /* Chinese */,
AB901BE31420707D00348EEC /* Norwegian */,
AB901BE41420708200348EEC /* Romanian */,
); );
name = Localizable.strings; name = Localizable.strings;
sourceTree = "<group>"; sourceTree = "<group>";
@ -3741,7 +3729,7 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DeSmuME (Xcode 5)" */ = { C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DeSmuME (Latest)" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
C01FCF4F08A954540054247B /* Debug */, C01FCF4F08A954540054247B /* Debug */,

2
desmume/src/cocoa/DeSmuME (Latest).xcodeproj/project.xcworkspace/contents.xcworkspacedata generated
View File

@ -2,6 +2,6 @@
<Workspace <Workspace
version = "1.0"> version = "1.0">
<FileRef <FileRef
location = "self:DeSmuME (Xcode 5).xcodeproj"> location = "self:DeSmuME (Latest).xcodeproj">
</FileRef> </FileRef>
</Workspace> </Workspace>

8
desmume/src/cocoa/DeSmuME (Latest).xcodeproj/xcshareddata/xcschemes/DeSmuME (OS X App).xcscheme
View File

@ -17,7 +17,7 @@
BlueprintIdentifier = "AB796CA415CDCBA200C59155" BlueprintIdentifier = "AB796CA415CDCBA200C59155"
BuildableName = "DeSmuME.app" BuildableName = "DeSmuME.app"
BlueprintName = "DeSmuME (OS X App)" BlueprintName = "DeSmuME (OS X App)"
ReferencedContainer = "container:DeSmuME (Xcode 5).xcodeproj"> ReferencedContainer = "container:DeSmuME (Latest).xcodeproj">
</BuildableReference> </BuildableReference>
</BuildActionEntry> </BuildActionEntry>
</BuildActionEntries> </BuildActionEntries>
@ -35,7 +35,7 @@
BlueprintIdentifier = "AB796CA415CDCBA200C59155" BlueprintIdentifier = "AB796CA415CDCBA200C59155"
BuildableName = "DeSmuME.app" BuildableName = "DeSmuME.app"
BlueprintName = "DeSmuME (OS X App)" BlueprintName = "DeSmuME (OS X App)"
ReferencedContainer = "container:DeSmuME (Xcode 5).xcodeproj"> ReferencedContainer = "container:DeSmuME (Latest).xcodeproj">
</BuildableReference> </BuildableReference>
</MacroExpansion> </MacroExpansion>
</TestAction> </TestAction>
@ -54,7 +54,7 @@
BlueprintIdentifier = "AB796CA415CDCBA200C59155" BlueprintIdentifier = "AB796CA415CDCBA200C59155"
BuildableName = "DeSmuME.app" BuildableName = "DeSmuME.app"
BlueprintName = "DeSmuME (OS X App)" BlueprintName = "DeSmuME (OS X App)"
ReferencedContainer = "container:DeSmuME (Xcode 5).xcodeproj"> ReferencedContainer = "container:DeSmuME (Latest).xcodeproj">
</BuildableReference> </BuildableReference>
</BuildableProductRunnable> </BuildableProductRunnable>
<AdditionalOptions> <AdditionalOptions>
@ -72,7 +72,7 @@
BlueprintIdentifier = "AB796CA415CDCBA200C59155" BlueprintIdentifier = "AB796CA415CDCBA200C59155"
BuildableName = "DeSmuME.app" BuildableName = "DeSmuME.app"
BlueprintName = "DeSmuME (OS X App)" BlueprintName = "DeSmuME (OS X App)"
ReferencedContainer = "container:DeSmuME (Xcode 5).xcodeproj"> ReferencedContainer = "container:DeSmuME (Latest).xcodeproj">
</BuildableReference> </BuildableReference>
</BuildableProductRunnable> </BuildableProductRunnable>
</ProfileAction> </ProfileAction>

8
desmume/src/cocoa/DeSmuME (Latest).xcodeproj/xcshareddata/xcschemes/DeSmuME (OS X App; dev+).xcscheme
View File

@ -17,7 +17,7 @@
BlueprintIdentifier = "AB8F3C171A53AC2600A80BF6" BlueprintIdentifier = "AB8F3C171A53AC2600A80BF6"
BuildableName = "DeSmuME (dev+).app" BuildableName = "DeSmuME (dev+).app"
BlueprintName = "DeSmuME (OS X App; dev+)" BlueprintName = "DeSmuME (OS X App; dev+)"
ReferencedContainer = "container:DeSmuME (Xcode 5).xcodeproj"> ReferencedContainer = "container:DeSmuME (Latest).xcodeproj">
</BuildableReference> </BuildableReference>
</BuildActionEntry> </BuildActionEntry>
</BuildActionEntries> </BuildActionEntries>
@ -35,7 +35,7 @@
BlueprintIdentifier = "AB8F3C171A53AC2600A80BF6" BlueprintIdentifier = "AB8F3C171A53AC2600A80BF6"
BuildableName = "DeSmuME (dev+).app" BuildableName = "DeSmuME (dev+).app"
BlueprintName = "DeSmuME (OS X App; dev+)" BlueprintName = "DeSmuME (OS X App; dev+)"
ReferencedContainer = "container:DeSmuME (Xcode 5).xcodeproj"> ReferencedContainer = "container:DeSmuME (Latest).xcodeproj">
</BuildableReference> </BuildableReference>
</MacroExpansion> </MacroExpansion>
</TestAction> </TestAction>
@ -54,7 +54,7 @@
BlueprintIdentifier = "AB8F3C171A53AC2600A80BF6" BlueprintIdentifier = "AB8F3C171A53AC2600A80BF6"
BuildableName = "DeSmuME (dev+).app" BuildableName = "DeSmuME (dev+).app"
BlueprintName = "DeSmuME (OS X App; dev+)" BlueprintName = "DeSmuME (OS X App; dev+)"
ReferencedContainer = "container:DeSmuME (Xcode 5).xcodeproj"> ReferencedContainer = "container:DeSmuME (Latest).xcodeproj">
</BuildableReference> </BuildableReference>
</BuildableProductRunnable> </BuildableProductRunnable>
<AdditionalOptions> <AdditionalOptions>
@ -72,7 +72,7 @@
BlueprintIdentifier = "AB8F3C171A53AC2600A80BF6" BlueprintIdentifier = "AB8F3C171A53AC2600A80BF6"
BuildableName = "DeSmuME (dev+).app" BuildableName = "DeSmuME (dev+).app"
BlueprintName = "DeSmuME (OS X App; dev+)" BlueprintName = "DeSmuME (OS X App; dev+)"
ReferencedContainer = "container:DeSmuME (Xcode 5).xcodeproj"> ReferencedContainer = "container:DeSmuME (Latest).xcodeproj">
</BuildableReference> </BuildableReference>
</BuildableProductRunnable> </BuildableProductRunnable>
</ProfileAction> </ProfileAction>

8
desmume/src/cocoa/DeSmuME (Latest).xcodeproj/xcshareddata/xcschemes/DeSmuME (OS X App; v10.5 Leopard Release Build).xcscheme
View File

@ -16,7 +16,7 @@
BlueprintIdentifier = "8D1107260486CEB800E47090" BlueprintIdentifier = "8D1107260486CEB800E47090"
BuildableName = "DeSmuME.app" BuildableName = "DeSmuME.app"
BlueprintName = "DeSmuME (OS X App; v10.5 Leopard Release Build)" BlueprintName = "DeSmuME (OS X App; v10.5 Leopard Release Build)"
ReferencedContainer = "container:DeSmuME (Xcode 5).xcodeproj"> ReferencedContainer = "container:DeSmuME (Latest).xcodeproj">
</BuildableReference> </BuildableReference>
</BuildActionEntry> </BuildActionEntry>
</BuildActionEntries> </BuildActionEntries>
@ -34,7 +34,7 @@
BlueprintIdentifier = "8D1107260486CEB800E47090" BlueprintIdentifier = "8D1107260486CEB800E47090"
BuildableName = "DeSmuME.app" BuildableName = "DeSmuME.app"
BlueprintName = "DeSmuME (OS X App; v10.5 Leopard Release Build)" BlueprintName = "DeSmuME (OS X App; v10.5 Leopard Release Build)"
ReferencedContainer = "container:DeSmuME (Xcode 5).xcodeproj"> ReferencedContainer = "container:DeSmuME (Latest).xcodeproj">
</BuildableReference> </BuildableReference>
</MacroExpansion> </MacroExpansion>
</TestAction> </TestAction>
@ -53,7 +53,7 @@
BlueprintIdentifier = "8D1107260486CEB800E47090" BlueprintIdentifier = "8D1107260486CEB800E47090"
BuildableName = "DeSmuME.app" BuildableName = "DeSmuME.app"
BlueprintName = "DeSmuME (OS X App; v10.5 Leopard Release Build)" BlueprintName = "DeSmuME (OS X App; v10.5 Leopard Release Build)"
ReferencedContainer = "container:DeSmuME (Xcode 5).xcodeproj"> ReferencedContainer = "container:DeSmuME (Latest).xcodeproj">
</BuildableReference> </BuildableReference>
</BuildableProductRunnable> </BuildableProductRunnable>
<AdditionalOptions> <AdditionalOptions>
@ -71,7 +71,7 @@
BlueprintIdentifier = "8D1107260486CEB800E47090" BlueprintIdentifier = "8D1107260486CEB800E47090"
BuildableName = "DeSmuME.app" BuildableName = "DeSmuME.app"
BlueprintName = "DeSmuME (OS X App; v10.5 Leopard Release Build)" BlueprintName = "DeSmuME (OS X App; v10.5 Leopard Release Build)"
ReferencedContainer = "container:DeSmuME (Xcode 5).xcodeproj"> ReferencedContainer = "container:DeSmuME (Latest).xcodeproj">
</BuildableReference> </BuildableReference>
</BuildableProductRunnable> </BuildableProductRunnable>
</ProfileAction> </ProfileAction>

2
desmume/src/cocoa/DeSmuME (Latest).xcodeproj/xcshareddata/xcschemes/DeSmuME (OpenEmu Plug-in).xcscheme
View File

@ -16,7 +16,7 @@
BlueprintIdentifier = "ABB3C6461501BC6D00E0C22E" BlueprintIdentifier = "ABB3C6461501BC6D00E0C22E"
BuildableName = "DeSmuME.oecoreplugin" BuildableName = "DeSmuME.oecoreplugin"
BlueprintName = "DeSmuME (OpenEmu Plug-in)" BlueprintName = "DeSmuME (OpenEmu Plug-in)"
ReferencedContainer = "container:DeSmuME (Xcode 5).xcodeproj"> ReferencedContainer = "container:DeSmuME (Latest).xcodeproj">
</BuildableReference> </BuildableReference>
</BuildActionEntry> </BuildActionEntry>
</BuildActionEntries> </BuildActionEntries>