From 33c47ef2a30d256c5860013d85e177eb33ddbeab Mon Sep 17 00:00:00 2001 From: jpd002 Date: Sun, 9 Dec 2007 22:01:01 +0000 Subject: [PATCH] MacOSX git-svn-id: http://svn.purei.org/purei/trunk@193 b36208d7-6611-0410-8bec-b1987f11c4a2 --- Purei.xcodeproj/jpd001.mode1v3 | 126 +- Purei.xcodeproj/jpd001.pbxuser | 1878 +++++------------ Purei.xcodeproj/project.pbxproj | 9 +- Source/BasicBlock.cpp | 212 +- .../English.lproj/MainMenu.nib/designable.nib | 412 ++-- .../MainMenu.nib/keyedobjects.nib | Bin 9855 -> 9869 bytes Source/macosxui/GSH_OpenGLMacOSX.cpp | 1 - 7 files changed, 916 insertions(+), 1722 deletions(-) diff --git a/Purei.xcodeproj/jpd001.mode1v3 b/Purei.xcodeproj/jpd001.mode1v3 index 6c563a7f..26ec165d 100644 --- a/Purei.xcodeproj/jpd001.mode1v3 +++ b/Purei.xcodeproj/jpd001.mode1v3 @@ -267,7 +267,6 @@ PBXSmartGroupTreeModuleOutlineStateExpansionKey 29B97314FDCFA39411CA2CEA - 080E96DDFE201D6D7F000001 1C37FBAC04509CD000000102 1C37FABC05509CD000000102 @@ -316,7 +315,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - GSH_OpenGLMacOSX.cpp + Config.cpp PBXSplitModuleInNavigatorKey Split0 @@ -324,90 +323,19 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - GSH_OpenGLMacOSX.cpp + Config.cpp _historyCapacity 0 bookmark - 7EEF34910D0B97C0005FE2D8 + 7EEF350C0D0C9CD5005FE2D8 history - 7EEF33EA0D0B93B4005FE2D8 - 7EEF33EB0D0B93B4005FE2D8 - 7EEF33ED0D0B93B4005FE2D8 - 7EEF33EE0D0B93B4005FE2D8 - 7EEF33F00D0B93B4005FE2D8 - 7EEF33F10D0B93B4005FE2D8 - 7EEF33F50D0B93B4005FE2D8 - 7EEF33F60D0B93B4005FE2D8 - 7EEF34180D0B9417005FE2D8 - 7EEF34290D0B94EB005FE2D8 - 7EEF342A0D0B94EB005FE2D8 - 7EEF34660D0B95E5005FE2D8 - 7EEF347C0D0B963A005FE2D8 - 7EEF347D0D0B963A005FE2D8 - 7EEF347E0D0B963A005FE2D8 - 7EEF34890D0B9645005FE2D8 - 7EEF348A0D0B9645005FE2D8 - 7EEF348B0D0B9645005FE2D8 + 7EEF34CE0D0C99F1005FE2D8 + 7EEF350B0D0C9CD5005FE2D8 prevStack - 7E947B5C0D0A07F700A2AE15 - 7EEF334B0D0B8CF4005FE2D8 - 7EEF33550D0B8CF4005FE2D8 - 7EEF33570D0B8CF4005FE2D8 - 7EEF33590D0B8CF4005FE2D8 - 7EEF33850D0B8EDA005FE2D8 - 7EEF33880D0B8EDA005FE2D8 - 7EEF33F90D0B93B4005FE2D8 - 7EEF33FA0D0B93B4005FE2D8 - 7EEF33FB0D0B93B4005FE2D8 - 7EEF33FC0D0B93B4005FE2D8 - 7EEF33FD0D0B93B4005FE2D8 - 7EEF33FE0D0B93B4005FE2D8 - 7EEF34000D0B93B4005FE2D8 - 7EEF34010D0B93B4005FE2D8 - 7EEF34020D0B93B4005FE2D8 - 7EEF34030D0B93B4005FE2D8 - 7EEF34050D0B93B4005FE2D8 - 7EEF34060D0B93B4005FE2D8 - 7EEF34070D0B93B4005FE2D8 - 7EEF34090D0B93B4005FE2D8 - 7EEF340A0D0B93B4005FE2D8 - 7EEF340B0D0B93B4005FE2D8 - 7EEF340C0D0B93B4005FE2D8 - 7EEF340D0D0B93B4005FE2D8 - 7EEF340E0D0B93B4005FE2D8 - 7EEF340F0D0B93B4005FE2D8 - 7EEF34100D0B93B4005FE2D8 - 7EEF34110D0B93B4005FE2D8 - 7EEF34120D0B93B4005FE2D8 - 7EEF341C0D0B9417005FE2D8 - 7EEF341D0D0B9417005FE2D8 - 7EEF341E0D0B9417005FE2D8 - 7EEF342B0D0B94EB005FE2D8 - 7EEF342C0D0B94EB005FE2D8 - 7EEF342D0D0B94EB005FE2D8 - 7EEF342E0D0B94EB005FE2D8 - 7EEF342F0D0B94EB005FE2D8 - 7EEF34300D0B94EB005FE2D8 - 7EEF34310D0B94EB005FE2D8 - 7EEF34320D0B94EB005FE2D8 - 7EEF34500D0B956F005FE2D8 - 7EEF34510D0B956F005FE2D8 - 7EEF34520D0B956F005FE2D8 - 7EEF34530D0B956F005FE2D8 - 7EEF34540D0B956F005FE2D8 - 7EEF34550D0B956F005FE2D8 - 7EEF34680D0B95E5005FE2D8 - 7EEF34690D0B95E5005FE2D8 - 7EEF34800D0B963A005FE2D8 - 7EEF34810D0B963A005FE2D8 - 7EEF34820D0B963A005FE2D8 - 7EEF34830D0B963A005FE2D8 - 7EEF34840D0B963A005FE2D8 - 7EEF348C0D0B9645005FE2D8 - 7EEF348D0D0B9645005FE2D8 + 7EEF34D20D0C99F1005FE2D8 SplitCount @@ -465,9 +393,9 @@ TableOfContents - 7EEF32FB0D0B8B93005FE2D8 + 7EEF34BF0D0C9831005FE2D8 1CE0B1FE06471DED0097A5F4 - 7EEF32FC0D0B8B93005FE2D8 + 7EEF34C00D0C9831005FE2D8 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -601,12 +529,12 @@ 5 WindowOrderList - 7EEF33050D0B8B93005FE2D8 - 7EEF33060D0B8B93005FE2D8 - 7EEF33070D0B8B93005FE2D8 - 7E8986E20D08A40C0077F9ED - 1CD10A99069EF8BA00B06720 + 7EEF34E00D0C9A4E005FE2D8 + 7EEF34E10D0C9A4E005FE2D8 + 7EEF34E20D0C9A4E005FE2D8 1C78EAAD065D492600B07095 + 1CD10A99069EF8BA00B06720 + 7E8986E20D08A40C0077F9ED /Users/jpd001/Projects/Purei/Purei.xcodeproj WindowString @@ -633,7 +561,7 @@ PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - GSH_OpenGLMacOSX.cpp + BasicBlock.cpp StatusBarVisibility @@ -642,7 +570,7 @@ Frame {{0, 0}, {1280, 348}} RubberWindowFrame - 0 148 1280 630 0 0 1280 778 + 4 148 1280 630 0 0 1280 778 Module PBXNavigatorGroup @@ -666,7 +594,7 @@ Frame {{0, 353}, {1280, 236}} RubberWindowFrame - 0 148 1280 630 0 0 1280 778 + 4 148 1280 630 0 0 1280 778 Module PBXBuildResultsModule @@ -689,14 +617,14 @@ TableOfContents 7E8986E20D08A40C0077F9ED - 7EEF32FD0D0B8B93005FE2D8 + 7EEF34BA0D0C9828005FE2D8 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID ToolbarConfiguration xcode.toolbar.config.buildV3 WindowString - 0 148 1280 630 0 0 1280 778 + 4 148 1280 630 0 0 1280 778 WindowToolGUID 7E8986E20D08A40C0077F9ED WindowToolIsVisible @@ -809,13 +737,13 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 7EEF32FE0D0B8B93005FE2D8 + 7EEF34C10D0C9831005FE2D8 1C162984064C10D400B95A72 - 7EEF32FF0D0B8B93005FE2D8 - 7EEF33000D0B8B93005FE2D8 - 7EEF33010D0B8B93005FE2D8 - 7EEF33020D0B8B93005FE2D8 - 7EEF33030D0B8B93005FE2D8 + 7EEF34C20D0C9831005FE2D8 + 7EEF34C30D0C9831005FE2D8 + 7EEF34C40D0C9831005FE2D8 + 7EEF34C50D0C9831005FE2D8 + 7EEF34C60D0C9831005FE2D8 ToolbarConfiguration xcode.toolbar.config.debugV3 @@ -942,8 +870,6 @@ Dock - BecomeActive - ContentConfiguration PBXProjectModuleGUID @@ -979,7 +905,7 @@ TableOfContents 1C78EAAD065D492600B07095 - 7EEF33040D0B8B93005FE2D8 + 7EEF34C70D0C9831005FE2D8 1C78EAAC065D492600B07095 ToolbarConfiguration @@ -989,7 +915,7 @@ WindowToolGUID 1C78EAAD065D492600B07095 WindowToolIsVisible - + Identifier diff --git a/Purei.xcodeproj/jpd001.pbxuser b/Purei.xcodeproj/jpd001.pbxuser index efe5b0f1..883e2111 100644 --- a/Purei.xcodeproj/jpd001.pbxuser +++ b/Purei.xcodeproj/jpd001.pbxuser @@ -59,191 +59,127 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 218860420; - PBXWorkspaceStateSaveDate = 218860420; + PBXPerProjectTemplateStateSaveDate = 218929027; + PBXWorkspaceStateSaveDate = 218929027; }; perUserProjectItems = { - 7E947B230D09F99800A2AE15 = 7E947B230D09F99800A2AE15 /* PBXTextBookmark */; - 7E947B240D09F99800A2AE15 = 7E947B240D09F99800A2AE15 /* PBXTextBookmark */; - 7E947B250D09F99800A2AE15 = 7E947B250D09F99800A2AE15 /* PBXTextBookmark */; - 7E947B390D0A073C00A2AE15 = 7E947B390D0A073C00A2AE15 /* PBXTextBookmark */; - 7E947B3A0D0A073C00A2AE15 = 7E947B3A0D0A073C00A2AE15 /* PBXTextBookmark */; - 7E947B3C0D0A073C00A2AE15 = 7E947B3C0D0A073C00A2AE15 /* PBXTextBookmark */; - 7E947B400D0A073C00A2AE15 = 7E947B400D0A073C00A2AE15 /* PBXTextBookmark */; - 7E947B410D0A073C00A2AE15 = 7E947B410D0A073C00A2AE15 /* PBXTextBookmark */; - 7E947B420D0A073C00A2AE15 = 7E947B420D0A073C00A2AE15 /* PBXTextBookmark */; - 7E947B590D0A07F700A2AE15 = 7E947B590D0A07F700A2AE15 /* PBXTextBookmark */; 7E947B5C0D0A07F700A2AE15 = 7E947B5C0D0A07F700A2AE15 /* PBXTextBookmark */; - 7E947B5E0D0A07F700A2AE15 = 7E947B5E0D0A07F700A2AE15 /* PBXTextBookmark */; - 7E947B900D0A0CAA00A2AE15 = 7E947B900D0A0CAA00A2AE15 /* PBXTextBookmark */; - 7E947B9A0D0A0CAA00A2AE15 = 7E947B9A0D0A0CAA00A2AE15 /* PBXTextBookmark */; - 7E947B9B0D0A0CAA00A2AE15 = 7E947B9B0D0A0CAA00A2AE15 /* PBXTextBookmark */; - 7E947BC70D0A121B00A2AE15 = 7E947BC70D0A121B00A2AE15 /* PBXTextBookmark */; - 7E947BF30D0A42C300A2AE15 = 7E947BF30D0A42C300A2AE15 /* PBXTextBookmark */; - 7E947C2F0D0A6B5A00A2AE15 = 7E947C2F0D0A6B5A00A2AE15 /* PBXTextBookmark */; - 7E947C6F0D0B4F6200A2AE15 = 7E947C6F0D0B4F6200A2AE15 /* PBXTextBookmark */; - 7E947C720D0B4F6200A2AE15 = 7E947C720D0B4F6200A2AE15 /* PBXTextBookmark */; - 7E947C770D0B4F6200A2AE15 = 7E947C770D0B4F6200A2AE15 /* PBXTextBookmark */; - 7E947C780D0B4F6200A2AE15 = 7E947C780D0B4F6200A2AE15 /* PBXTextBookmark */; - 7EE203520D0B5296002D2B72 = 7EE203520D0B5296002D2B72 /* PBXTextBookmark */; - 7EE203540D0B5296002D2B72 = 7EE203540D0B5296002D2B72 /* PBXTextBookmark */; - 7EE203650D0B8AA4002D2B72 = 7EE203650D0B8AA4002D2B72 /* PBXTextBookmark */; - 7EE203660D0B8AA4002D2B72 = 7EE203660D0B8AA4002D2B72 /* PBXTextBookmark */; - 7EE203680D0B8AA4002D2B72 = 7EE203680D0B8AA4002D2B72 /* PBXTextBookmark */; - 7EE203690D0B8AA4002D2B72 = 7EE203690D0B8AA4002D2B72 /* PBXTextBookmark */; - 7EE203720D0B8B59002D2B72 = 7EE203720D0B8B59002D2B72 /* PBXTextBookmark */; - 7EE203730D0B8B59002D2B72 = 7EE203730D0B8B59002D2B72 /* PBXTextBookmark */; - 7EE203740D0B8B59002D2B72 = 7EE203740D0B8B59002D2B72 /* PBXTextBookmark */; - 7EE203750D0B8B59002D2B72 = 7EE203750D0B8B59002D2B72 /* PBXTextBookmark */; - 7EE203760D0B8B59002D2B72 = 7EE203760D0B8B59002D2B72 /* PBXTextBookmark */; - 7EE203770D0B8B59002D2B72 = 7EE203770D0B8B59002D2B72 /* PBXTextBookmark */; - 7EE2037C0D0B8B6F002D2B72 = 7EE2037C0D0B8B6F002D2B72 /* PBXTextBookmark */; - 7EEF32FA0D0B8B93005FE2D8 /* PBXTextBookmark */ = 7EEF32FA0D0B8B93005FE2D8 /* PBXTextBookmark */; - 7EEF333E0D0B8CF4005FE2D8 /* PBXTextBookmark */ = 7EEF333E0D0B8CF4005FE2D8 /* PBXTextBookmark */; - 7EEF33400D0B8CF4005FE2D8 /* PBXTextBookmark */ = 7EEF33400D0B8CF4005FE2D8 /* PBXTextBookmark */; - 7EEF33420D0B8CF4005FE2D8 /* PBXTextBookmark */ = 7EEF33420D0B8CF4005FE2D8 /* PBXTextBookmark */; - 7EEF33440D0B8CF4005FE2D8 /* PBXTextBookmark */ = 7EEF33440D0B8CF4005FE2D8 /* PBXTextBookmark */; - 7EEF33460D0B8CF4005FE2D8 /* PBXTextBookmark */ = 7EEF33460D0B8CF4005FE2D8 /* PBXTextBookmark */; - 7EEF33470D0B8CF4005FE2D8 /* PBXTextBookmark */ = 7EEF33470D0B8CF4005FE2D8 /* PBXTextBookmark */; - 7EEF33480D0B8CF4005FE2D8 /* PBXTextBookmark */ = 7EEF33480D0B8CF4005FE2D8 /* PBXTextBookmark */; - 7EEF33490D0B8CF4005FE2D8 /* PBXBookmark */ = 7EEF33490D0B8CF4005FE2D8 /* PBXBookmark */; - 7EEF334A0D0B8CF4005FE2D8 /* PBXTextBookmark */ = 7EEF334A0D0B8CF4005FE2D8 /* PBXTextBookmark */; - 7EEF334B0D0B8CF4005FE2D8 /* PBXTextBookmark */ = 7EEF334B0D0B8CF4005FE2D8 /* PBXTextBookmark */; - 7EEF334C0D0B8CF4005FE2D8 /* PBXTextBookmark */ = 7EEF334C0D0B8CF4005FE2D8 /* PBXTextBookmark */; - 7EEF334E0D0B8CF4005FE2D8 /* PBXTextBookmark */ = 7EEF334E0D0B8CF4005FE2D8 /* PBXTextBookmark */; - 7EEF33500D0B8CF4005FE2D8 /* PBXTextBookmark */ = 7EEF33500D0B8CF4005FE2D8 /* PBXTextBookmark */; - 7EEF33520D0B8CF4005FE2D8 /* PBXTextBookmark */ = 7EEF33520D0B8CF4005FE2D8 /* PBXTextBookmark */; - 7EEF33540D0B8CF4005FE2D8 /* PBXTextBookmark */ = 7EEF33540D0B8CF4005FE2D8 /* PBXTextBookmark */; - 7EEF33550D0B8CF4005FE2D8 /* PBXTextBookmark */ = 7EEF33550D0B8CF4005FE2D8 /* PBXTextBookmark */; - 7EEF33560D0B8CF4005FE2D8 /* PBXTextBookmark */ = 7EEF33560D0B8CF4005FE2D8 /* PBXTextBookmark */; - 7EEF33570D0B8CF4005FE2D8 /* PBXTextBookmark */ = 7EEF33570D0B8CF4005FE2D8 /* PBXTextBookmark */; - 7EEF33580D0B8CF4005FE2D8 /* PBXTextBookmark */ = 7EEF33580D0B8CF4005FE2D8 /* PBXTextBookmark */; - 7EEF33590D0B8CF4005FE2D8 /* PBXTextBookmark */ = 7EEF33590D0B8CF4005FE2D8 /* PBXTextBookmark */; - 7EEF335A0D0B8CF4005FE2D8 /* PBXTextBookmark */ = 7EEF335A0D0B8CF4005FE2D8 /* PBXTextBookmark */; - 7EEF335E0D0B8D2E005FE2D8 /* PBXTextBookmark */ = 7EEF335E0D0B8D2E005FE2D8 /* PBXTextBookmark */; - 7EEF33640D0B8D6E005FE2D8 /* PBXTextBookmark */ = 7EEF33640D0B8D6E005FE2D8 /* PBXTextBookmark */; - 7EEF33650D0B8D6E005FE2D8 /* PBXTextBookmark */ = 7EEF33650D0B8D6E005FE2D8 /* PBXTextBookmark */; - 7EEF33660D0B8D6E005FE2D8 /* PBXTextBookmark */ = 7EEF33660D0B8D6E005FE2D8 /* PBXTextBookmark */; - 7EEF33670D0B8D6E005FE2D8 /* PBXTextBookmark */ = 7EEF33670D0B8D6E005FE2D8 /* PBXTextBookmark */; - 7EEF336A0D0B8D9A005FE2D8 /* PBXTextBookmark */ = 7EEF336A0D0B8D9A005FE2D8 /* PBXTextBookmark */; - 7EEF33810D0B8EDA005FE2D8 /* PBXTextBookmark */ = 7EEF33810D0B8EDA005FE2D8 /* PBXTextBookmark */; - 7EEF33820D0B8EDA005FE2D8 /* PBXTextBookmark */ = 7EEF33820D0B8EDA005FE2D8 /* PBXTextBookmark */; - 7EEF33830D0B8EDA005FE2D8 /* PBXTextBookmark */ = 7EEF33830D0B8EDA005FE2D8 /* PBXTextBookmark */; - 7EEF33840D0B8EDA005FE2D8 /* PBXTextBookmark */ = 7EEF33840D0B8EDA005FE2D8 /* PBXTextBookmark */; - 7EEF33850D0B8EDA005FE2D8 /* PBXTextBookmark */ = 7EEF33850D0B8EDA005FE2D8 /* PBXTextBookmark */; - 7EEF33860D0B8EDA005FE2D8 /* PBXTextBookmark */ = 7EEF33860D0B8EDA005FE2D8 /* PBXTextBookmark */; - 7EEF33870D0B8EDA005FE2D8 /* PBXTextBookmark */ = 7EEF33870D0B8EDA005FE2D8 /* PBXTextBookmark */; - 7EEF33880D0B8EDA005FE2D8 /* PBXTextBookmark */ = 7EEF33880D0B8EDA005FE2D8 /* PBXTextBookmark */; - 7EEF33890D0B8EDA005FE2D8 /* PBXTextBookmark */ = 7EEF33890D0B8EDA005FE2D8 /* PBXTextBookmark */; - 7EEF338A0D0B8EDA005FE2D8 /* PBXTextBookmark */ = 7EEF338A0D0B8EDA005FE2D8 /* PBXTextBookmark */; - 7EEF33B70D0B90E8005FE2D8 /* PBXTextBookmark */ = 7EEF33B70D0B90E8005FE2D8 /* PBXTextBookmark */; - 7EEF33B80D0B90E8005FE2D8 /* PBXTextBookmark */ = 7EEF33B80D0B90E8005FE2D8 /* PBXTextBookmark */; - 7EEF33B90D0B90E8005FE2D8 /* PBXTextBookmark */ = 7EEF33B90D0B90E8005FE2D8 /* PBXTextBookmark */; - 7EEF33BA0D0B90E8005FE2D8 /* PBXTextBookmark */ = 7EEF33BA0D0B90E8005FE2D8 /* PBXTextBookmark */; - 7EEF33BB0D0B90E8005FE2D8 /* PBXTextBookmark */ = 7EEF33BB0D0B90E8005FE2D8 /* PBXTextBookmark */; - 7EEF33BE0D0B9163005FE2D8 /* PBXTextBookmark */ = 7EEF33BE0D0B9163005FE2D8 /* PBXTextBookmark */; - 7EEF33EA0D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF33EA0D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF33EB0D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF33EB0D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF33ED0D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF33ED0D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF33EE0D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF33EE0D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF33F00D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF33F00D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF33F10D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF33F10D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF33F30D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF33F30D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF33F40D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF33F40D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF33F50D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF33F50D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF33F60D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF33F60D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF33F70D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF33F70D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF33F80D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF33F80D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF33F90D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF33F90D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF33FA0D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF33FA0D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF33FB0D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF33FB0D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF33FC0D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF33FC0D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF33FD0D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF33FD0D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF33FE0D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF33FE0D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF34000D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF34000D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF34010D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF34010D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF34020D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF34020D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF34030D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF34030D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF34050D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF34050D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF34060D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF34060D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF34070D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF34070D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF34090D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF34090D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF340A0D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF340A0D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF340B0D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF340B0D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF340C0D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF340C0D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF340D0D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF340D0D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF340E0D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF340E0D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF340F0D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF340F0D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF34100D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF34100D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF34110D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF34110D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF34120D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF34120D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF34130D0B93B4005FE2D8 /* PBXTextBookmark */ = 7EEF34130D0B93B4005FE2D8 /* PBXTextBookmark */; - 7EEF34140D0B9415005FE2D8 /* PBXTextBookmark */ = 7EEF34140D0B9415005FE2D8 /* PBXTextBookmark */; - 7EEF34150D0B9415005FE2D8 /* PBXTextBookmark */ = 7EEF34150D0B9415005FE2D8 /* PBXTextBookmark */; - 7EEF34160D0B9415005FE2D8 /* PBXTextBookmark */ = 7EEF34160D0B9415005FE2D8 /* PBXTextBookmark */; - 7EEF34170D0B9415005FE2D8 /* PBXTextBookmark */ = 7EEF34170D0B9415005FE2D8 /* PBXTextBookmark */; - 7EEF34180D0B9417005FE2D8 /* PBXTextBookmark */ = 7EEF34180D0B9417005FE2D8 /* PBXTextBookmark */; - 7EEF34190D0B9417005FE2D8 /* PBXTextBookmark */ = 7EEF34190D0B9417005FE2D8 /* PBXTextBookmark */; - 7EEF341A0D0B9417005FE2D8 /* PBXTextBookmark */ = 7EEF341A0D0B9417005FE2D8 /* PBXTextBookmark */; - 7EEF341B0D0B9417005FE2D8 /* PBXTextBookmark */ = 7EEF341B0D0B9417005FE2D8 /* PBXTextBookmark */; - 7EEF341C0D0B9417005FE2D8 /* PBXTextBookmark */ = 7EEF341C0D0B9417005FE2D8 /* PBXTextBookmark */; - 7EEF341D0D0B9417005FE2D8 /* PBXTextBookmark */ = 7EEF341D0D0B9417005FE2D8 /* PBXTextBookmark */; - 7EEF341E0D0B9417005FE2D8 /* PBXTextBookmark */ = 7EEF341E0D0B9417005FE2D8 /* PBXTextBookmark */; - 7EEF341F0D0B9417005FE2D8 /* PBXTextBookmark */ = 7EEF341F0D0B9417005FE2D8 /* PBXTextBookmark */; - 7EEF34230D0B94DB005FE2D8 /* PBXTextBookmark */ = 7EEF34230D0B94DB005FE2D8 /* PBXTextBookmark */; - 7EEF34240D0B94DB005FE2D8 /* PBXTextBookmark */ = 7EEF34240D0B94DB005FE2D8 /* PBXTextBookmark */; - 7EEF34250D0B94DB005FE2D8 /* PBXTextBookmark */ = 7EEF34250D0B94DB005FE2D8 /* PBXTextBookmark */; - 7EEF34260D0B94DB005FE2D8 /* PBXTextBookmark */ = 7EEF34260D0B94DB005FE2D8 /* PBXTextBookmark */; - 7EEF34290D0B94EB005FE2D8 /* PBXTextBookmark */ = 7EEF34290D0B94EB005FE2D8 /* PBXTextBookmark */; - 7EEF342A0D0B94EB005FE2D8 /* PBXTextBookmark */ = 7EEF342A0D0B94EB005FE2D8 /* PBXTextBookmark */; - 7EEF342B0D0B94EB005FE2D8 /* PBXTextBookmark */ = 7EEF342B0D0B94EB005FE2D8 /* PBXTextBookmark */; - 7EEF342C0D0B94EB005FE2D8 /* PBXTextBookmark */ = 7EEF342C0D0B94EB005FE2D8 /* PBXTextBookmark */; - 7EEF342D0D0B94EB005FE2D8 /* PBXTextBookmark */ = 7EEF342D0D0B94EB005FE2D8 /* PBXTextBookmark */; - 7EEF342E0D0B94EB005FE2D8 /* PBXTextBookmark */ = 7EEF342E0D0B94EB005FE2D8 /* PBXTextBookmark */; - 7EEF342F0D0B94EB005FE2D8 /* PBXTextBookmark */ = 7EEF342F0D0B94EB005FE2D8 /* PBXTextBookmark */; - 7EEF34300D0B94EB005FE2D8 /* PBXTextBookmark */ = 7EEF34300D0B94EB005FE2D8 /* PBXTextBookmark */; - 7EEF34310D0B94EB005FE2D8 /* PBXTextBookmark */ = 7EEF34310D0B94EB005FE2D8 /* PBXTextBookmark */; - 7EEF34320D0B94EB005FE2D8 /* PBXTextBookmark */ = 7EEF34320D0B94EB005FE2D8 /* PBXTextBookmark */; - 7EEF34330D0B94EB005FE2D8 /* PBXTextBookmark */ = 7EEF34330D0B94EB005FE2D8 /* PBXTextBookmark */; - 7EEF344C0D0B956F005FE2D8 /* PBXTextBookmark */ = 7EEF344C0D0B956F005FE2D8 /* PBXTextBookmark */; - 7EEF344D0D0B956F005FE2D8 /* PBXTextBookmark */ = 7EEF344D0D0B956F005FE2D8 /* PBXTextBookmark */; - 7EEF344E0D0B956F005FE2D8 /* PBXTextBookmark */ = 7EEF344E0D0B956F005FE2D8 /* PBXTextBookmark */; - 7EEF344F0D0B956F005FE2D8 /* PBXTextBookmark */ = 7EEF344F0D0B956F005FE2D8 /* PBXTextBookmark */; - 7EEF34500D0B956F005FE2D8 /* PBXTextBookmark */ = 7EEF34500D0B956F005FE2D8 /* PBXTextBookmark */; - 7EEF34510D0B956F005FE2D8 /* PBXTextBookmark */ = 7EEF34510D0B956F005FE2D8 /* PBXTextBookmark */; - 7EEF34520D0B956F005FE2D8 /* PBXTextBookmark */ = 7EEF34520D0B956F005FE2D8 /* PBXTextBookmark */; - 7EEF34530D0B956F005FE2D8 /* PBXTextBookmark */ = 7EEF34530D0B956F005FE2D8 /* PBXTextBookmark */; - 7EEF34540D0B956F005FE2D8 /* PBXTextBookmark */ = 7EEF34540D0B956F005FE2D8 /* PBXTextBookmark */; - 7EEF34550D0B956F005FE2D8 /* PBXTextBookmark */ = 7EEF34550D0B956F005FE2D8 /* PBXTextBookmark */; - 7EEF34560D0B956F005FE2D8 /* PBXTextBookmark */ = 7EEF34560D0B956F005FE2D8 /* PBXTextBookmark */; - 7EEF34610D0B957C005FE2D8 /* PBXTextBookmark */ = 7EEF34610D0B957C005FE2D8 /* PBXTextBookmark */; - 7EEF34630D0B959B005FE2D8 /* PBXTextBookmark */ = 7EEF34630D0B959B005FE2D8 /* PBXTextBookmark */; - 7EEF34660D0B95E5005FE2D8 /* PBXTextBookmark */ = 7EEF34660D0B95E5005FE2D8 /* PBXTextBookmark */; - 7EEF34670D0B95E5005FE2D8 /* PBXTextBookmark */ = 7EEF34670D0B95E5005FE2D8 /* PBXTextBookmark */; - 7EEF34680D0B95E5005FE2D8 /* PBXTextBookmark */ = 7EEF34680D0B95E5005FE2D8 /* PBXTextBookmark */; - 7EEF34690D0B95E5005FE2D8 /* PBXTextBookmark */ = 7EEF34690D0B95E5005FE2D8 /* PBXTextBookmark */; - 7EEF346A0D0B95E5005FE2D8 /* PBXTextBookmark */ = 7EEF346A0D0B95E5005FE2D8 /* PBXTextBookmark */; - 7EEF34770D0B961A005FE2D8 /* PBXTextBookmark */ = 7EEF34770D0B961A005FE2D8 /* PBXTextBookmark */; - 7EEF347A0D0B963A005FE2D8 /* PBXTextBookmark */ = 7EEF347A0D0B963A005FE2D8 /* PBXTextBookmark */; - 7EEF347B0D0B963A005FE2D8 /* PBXTextBookmark */ = 7EEF347B0D0B963A005FE2D8 /* PBXTextBookmark */; - 7EEF347C0D0B963A005FE2D8 /* PBXTextBookmark */ = 7EEF347C0D0B963A005FE2D8 /* PBXTextBookmark */; - 7EEF347D0D0B963A005FE2D8 /* PBXTextBookmark */ = 7EEF347D0D0B963A005FE2D8 /* PBXTextBookmark */; - 7EEF347E0D0B963A005FE2D8 /* PBXTextBookmark */ = 7EEF347E0D0B963A005FE2D8 /* PBXTextBookmark */; - 7EEF347F0D0B963A005FE2D8 /* PBXBookmark */ = 7EEF347F0D0B963A005FE2D8 /* PBXBookmark */; - 7EEF34800D0B963A005FE2D8 /* PBXTextBookmark */ = 7EEF34800D0B963A005FE2D8 /* PBXTextBookmark */; - 7EEF34810D0B963A005FE2D8 /* PBXTextBookmark */ = 7EEF34810D0B963A005FE2D8 /* PBXTextBookmark */; - 7EEF34820D0B963A005FE2D8 /* PBXTextBookmark */ = 7EEF34820D0B963A005FE2D8 /* PBXTextBookmark */; - 7EEF34830D0B963A005FE2D8 /* PBXTextBookmark */ = 7EEF34830D0B963A005FE2D8 /* PBXTextBookmark */; - 7EEF34840D0B963A005FE2D8 /* PBXTextBookmark */ = 7EEF34840D0B963A005FE2D8 /* PBXTextBookmark */; - 7EEF34850D0B963A005FE2D8 /* PBXTextBookmark */ = 7EEF34850D0B963A005FE2D8 /* PBXTextBookmark */; - 7EEF34890D0B9645005FE2D8 /* PBXTextBookmark */ = 7EEF34890D0B9645005FE2D8 /* PBXTextBookmark */; - 7EEF348A0D0B9645005FE2D8 /* PBXTextBookmark */ = 7EEF348A0D0B9645005FE2D8 /* PBXTextBookmark */; - 7EEF348B0D0B9645005FE2D8 /* PBXTextBookmark */ = 7EEF348B0D0B9645005FE2D8 /* PBXTextBookmark */; - 7EEF348C0D0B9645005FE2D8 /* PBXTextBookmark */ = 7EEF348C0D0B9645005FE2D8 /* PBXTextBookmark */; - 7EEF348D0D0B9645005FE2D8 /* PBXTextBookmark */ = 7EEF348D0D0B9645005FE2D8 /* PBXTextBookmark */; - 7EEF348E0D0B9645005FE2D8 /* PBXTextBookmark */ = 7EEF348E0D0B9645005FE2D8 /* PBXTextBookmark */; - 7EEF34900D0B97BD005FE2D8 /* PBXTextBookmark */ = 7EEF34900D0B97BD005FE2D8 /* PBXTextBookmark */; - 7EEF34910D0B97C0005FE2D8 /* PBXTextBookmark */ = 7EEF34910D0B97C0005FE2D8 /* PBXTextBookmark */; + 7EEF334B0D0B8CF4005FE2D8 = 7EEF334B0D0B8CF4005FE2D8 /* PBXTextBookmark */; + 7EEF33550D0B8CF4005FE2D8 = 7EEF33550D0B8CF4005FE2D8 /* PBXTextBookmark */; + 7EEF33570D0B8CF4005FE2D8 = 7EEF33570D0B8CF4005FE2D8 /* PBXTextBookmark */; + 7EEF33590D0B8CF4005FE2D8 = 7EEF33590D0B8CF4005FE2D8 /* PBXTextBookmark */; + 7EEF33850D0B8EDA005FE2D8 = 7EEF33850D0B8EDA005FE2D8 /* PBXTextBookmark */; + 7EEF33880D0B8EDA005FE2D8 = 7EEF33880D0B8EDA005FE2D8 /* PBXTextBookmark */; + 7EEF33EA0D0B93B4005FE2D8 = 7EEF33EA0D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF33EB0D0B93B4005FE2D8 = 7EEF33EB0D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF33ED0D0B93B4005FE2D8 = 7EEF33ED0D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF33EE0D0B93B4005FE2D8 = 7EEF33EE0D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF33F00D0B93B4005FE2D8 = 7EEF33F00D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF33F10D0B93B4005FE2D8 = 7EEF33F10D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF33F50D0B93B4005FE2D8 = 7EEF33F50D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF33F60D0B93B4005FE2D8 = 7EEF33F60D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF33F90D0B93B4005FE2D8 = 7EEF33F90D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF33FA0D0B93B4005FE2D8 = 7EEF33FA0D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF33FB0D0B93B4005FE2D8 = 7EEF33FB0D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF33FC0D0B93B4005FE2D8 = 7EEF33FC0D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF33FD0D0B93B4005FE2D8 = 7EEF33FD0D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF33FE0D0B93B4005FE2D8 = 7EEF33FE0D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF34000D0B93B4005FE2D8 = 7EEF34000D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF34010D0B93B4005FE2D8 = 7EEF34010D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF34020D0B93B4005FE2D8 = 7EEF34020D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF34030D0B93B4005FE2D8 = 7EEF34030D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF34050D0B93B4005FE2D8 = 7EEF34050D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF34060D0B93B4005FE2D8 = 7EEF34060D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF34070D0B93B4005FE2D8 = 7EEF34070D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF34090D0B93B4005FE2D8 = 7EEF34090D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF340A0D0B93B4005FE2D8 = 7EEF340A0D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF340B0D0B93B4005FE2D8 = 7EEF340B0D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF340C0D0B93B4005FE2D8 = 7EEF340C0D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF340D0D0B93B4005FE2D8 = 7EEF340D0D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF340E0D0B93B4005FE2D8 = 7EEF340E0D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF340F0D0B93B4005FE2D8 = 7EEF340F0D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF34100D0B93B4005FE2D8 = 7EEF34100D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF34110D0B93B4005FE2D8 = 7EEF34110D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF34120D0B93B4005FE2D8 = 7EEF34120D0B93B4005FE2D8 /* PBXTextBookmark */; + 7EEF34180D0B9417005FE2D8 = 7EEF34180D0B9417005FE2D8 /* PBXTextBookmark */; + 7EEF341C0D0B9417005FE2D8 = 7EEF341C0D0B9417005FE2D8 /* PBXTextBookmark */; + 7EEF341D0D0B9417005FE2D8 = 7EEF341D0D0B9417005FE2D8 /* PBXTextBookmark */; + 7EEF341E0D0B9417005FE2D8 = 7EEF341E0D0B9417005FE2D8 /* PBXTextBookmark */; + 7EEF34290D0B94EB005FE2D8 = 7EEF34290D0B94EB005FE2D8 /* PBXTextBookmark */; + 7EEF342A0D0B94EB005FE2D8 = 7EEF342A0D0B94EB005FE2D8 /* PBXTextBookmark */; + 7EEF342B0D0B94EB005FE2D8 = 7EEF342B0D0B94EB005FE2D8 /* PBXTextBookmark */; + 7EEF342C0D0B94EB005FE2D8 = 7EEF342C0D0B94EB005FE2D8 /* PBXTextBookmark */; + 7EEF342D0D0B94EB005FE2D8 = 7EEF342D0D0B94EB005FE2D8 /* PBXTextBookmark */; + 7EEF342E0D0B94EB005FE2D8 = 7EEF342E0D0B94EB005FE2D8 /* PBXTextBookmark */; + 7EEF342F0D0B94EB005FE2D8 = 7EEF342F0D0B94EB005FE2D8 /* PBXTextBookmark */; + 7EEF34300D0B94EB005FE2D8 = 7EEF34300D0B94EB005FE2D8 /* PBXTextBookmark */; + 7EEF34310D0B94EB005FE2D8 = 7EEF34310D0B94EB005FE2D8 /* PBXTextBookmark */; + 7EEF34320D0B94EB005FE2D8 = 7EEF34320D0B94EB005FE2D8 /* PBXTextBookmark */; + 7EEF34500D0B956F005FE2D8 = 7EEF34500D0B956F005FE2D8 /* PBXTextBookmark */; + 7EEF34510D0B956F005FE2D8 = 7EEF34510D0B956F005FE2D8 /* PBXTextBookmark */; + 7EEF34520D0B956F005FE2D8 = 7EEF34520D0B956F005FE2D8 /* PBXTextBookmark */; + 7EEF34530D0B956F005FE2D8 = 7EEF34530D0B956F005FE2D8 /* PBXTextBookmark */; + 7EEF34540D0B956F005FE2D8 = 7EEF34540D0B956F005FE2D8 /* PBXTextBookmark */; + 7EEF34550D0B956F005FE2D8 = 7EEF34550D0B956F005FE2D8 /* PBXTextBookmark */; + 7EEF34660D0B95E5005FE2D8 = 7EEF34660D0B95E5005FE2D8 /* PBXTextBookmark */; + 7EEF34680D0B95E5005FE2D8 = 7EEF34680D0B95E5005FE2D8 /* PBXTextBookmark */; + 7EEF34690D0B95E5005FE2D8 = 7EEF34690D0B95E5005FE2D8 /* PBXTextBookmark */; + 7EEF347C0D0B963A005FE2D8 = 7EEF347C0D0B963A005FE2D8 /* PBXTextBookmark */; + 7EEF347D0D0B963A005FE2D8 = 7EEF347D0D0B963A005FE2D8 /* PBXTextBookmark */; + 7EEF347E0D0B963A005FE2D8 = 7EEF347E0D0B963A005FE2D8 /* PBXTextBookmark */; + 7EEF34800D0B963A005FE2D8 = 7EEF34800D0B963A005FE2D8 /* PBXTextBookmark */; + 7EEF34810D0B963A005FE2D8 = 7EEF34810D0B963A005FE2D8 /* PBXTextBookmark */; + 7EEF34820D0B963A005FE2D8 = 7EEF34820D0B963A005FE2D8 /* PBXTextBookmark */; + 7EEF34830D0B963A005FE2D8 = 7EEF34830D0B963A005FE2D8 /* PBXTextBookmark */; + 7EEF34840D0B963A005FE2D8 = 7EEF34840D0B963A005FE2D8 /* PBXTextBookmark */; + 7EEF34890D0B9645005FE2D8 = 7EEF34890D0B9645005FE2D8 /* PBXTextBookmark */; + 7EEF348A0D0B9645005FE2D8 = 7EEF348A0D0B9645005FE2D8 /* PBXTextBookmark */; + 7EEF348B0D0B9645005FE2D8 = 7EEF348B0D0B9645005FE2D8 /* PBXTextBookmark */; + 7EEF348C0D0B9645005FE2D8 = 7EEF348C0D0B9645005FE2D8 /* PBXTextBookmark */; + 7EEF348D0D0B9645005FE2D8 = 7EEF348D0D0B9645005FE2D8 /* PBXTextBookmark */; + 7EEF34960D0C96F0005FE2D8 = 7EEF34960D0C96F0005FE2D8 /* PBXTextBookmark */; + 7EEF34B80D0C9828005FE2D8 /* PBXTextBookmark */ = 7EEF34B80D0C9828005FE2D8 /* PBXTextBookmark */; + 7EEF34B90D0C9828005FE2D8 /* PBXTextBookmark */ = 7EEF34B90D0C9828005FE2D8 /* PBXTextBookmark */; + 7EEF34BC0D0C9831005FE2D8 /* PBXTextBookmark */ = 7EEF34BC0D0C9831005FE2D8 /* PBXTextBookmark */; + 7EEF34BD0D0C9831005FE2D8 /* PBXTextBookmark */ = 7EEF34BD0D0C9831005FE2D8 /* PBXTextBookmark */; + 7EEF34BE0D0C9831005FE2D8 /* PBXTextBookmark */ = 7EEF34BE0D0C9831005FE2D8 /* PBXTextBookmark */; + 7EEF34CE0D0C99F1005FE2D8 /* PBXTextBookmark */ = 7EEF34CE0D0C99F1005FE2D8 /* PBXTextBookmark */; + 7EEF34CF0D0C99F1005FE2D8 /* PBXTextBookmark */ = 7EEF34CF0D0C99F1005FE2D8 /* PBXTextBookmark */; + 7EEF34D00D0C99F1005FE2D8 /* PBXTextBookmark */ = 7EEF34D00D0C99F1005FE2D8 /* PBXTextBookmark */; + 7EEF34D10D0C99F1005FE2D8 /* PBXTextBookmark */ = 7EEF34D10D0C99F1005FE2D8 /* PBXTextBookmark */; + 7EEF34D20D0C99F1005FE2D8 /* PBXTextBookmark */ = 7EEF34D20D0C99F1005FE2D8 /* PBXTextBookmark */; + 7EEF34D30D0C99F1005FE2D8 /* PBXTextBookmark */ = 7EEF34D30D0C99F1005FE2D8 /* PBXTextBookmark */; + 7EEF34D40D0C99F1005FE2D8 /* PBXTextBookmark */ = 7EEF34D40D0C99F1005FE2D8 /* PBXTextBookmark */; + 7EEF34D50D0C99F1005FE2D8 /* PBXTextBookmark */ = 7EEF34D50D0C99F1005FE2D8 /* PBXTextBookmark */; + 7EEF34D60D0C99F1005FE2D8 /* PBXTextBookmark */ = 7EEF34D60D0C99F1005FE2D8 /* PBXTextBookmark */; + 7EEF34D70D0C99F1005FE2D8 /* PBXTextBookmark */ = 7EEF34D70D0C99F1005FE2D8 /* PBXTextBookmark */; + 7EEF34DF0D0C9A4E005FE2D8 /* PBXTextBookmark */ = 7EEF34DF0D0C9A4E005FE2D8 /* PBXTextBookmark */; + 7EEF34ED0D0C9B77005FE2D8 /* PBXTextBookmark */ = 7EEF34ED0D0C9B77005FE2D8 /* PBXTextBookmark */; + 7EEF34EE0D0C9B78005FE2D8 /* PBXTextBookmark */ = 7EEF34EE0D0C9B78005FE2D8 /* PBXTextBookmark */; + 7EEF34EF0D0C9B78005FE2D8 /* PBXTextBookmark */ = 7EEF34EF0D0C9B78005FE2D8 /* PBXTextBookmark */; + 7EEF34F00D0C9B78005FE2D8 /* PBXTextBookmark */ = 7EEF34F00D0C9B78005FE2D8 /* PBXTextBookmark */; + 7EEF34F10D0C9B78005FE2D8 /* PBXTextBookmark */ = 7EEF34F10D0C9B78005FE2D8 /* PBXTextBookmark */; + 7EEF34F20D0C9B78005FE2D8 /* PBXTextBookmark */ = 7EEF34F20D0C9B78005FE2D8 /* PBXTextBookmark */; + 7EEF34F30D0C9B78005FE2D8 /* PBXTextBookmark */ = 7EEF34F30D0C9B78005FE2D8 /* PBXTextBookmark */; + 7EEF34F40D0C9B78005FE2D8 /* PBXTextBookmark */ = 7EEF34F40D0C9B78005FE2D8 /* PBXTextBookmark */; + 7EEF34F50D0C9B78005FE2D8 /* PBXTextBookmark */ = 7EEF34F50D0C9B78005FE2D8 /* PBXTextBookmark */; + 7EEF34F60D0C9B78005FE2D8 /* PBXTextBookmark */ = 7EEF34F60D0C9B78005FE2D8 /* PBXTextBookmark */; + 7EEF34F70D0C9B78005FE2D8 /* PBXTextBookmark */ = 7EEF34F70D0C9B78005FE2D8 /* PBXTextBookmark */; + 7EEF34F80D0C9B78005FE2D8 /* PBXTextBookmark */ = 7EEF34F80D0C9B78005FE2D8 /* PBXTextBookmark */; + 7EEF34F90D0C9B78005FE2D8 /* PBXTextBookmark */ = 7EEF34F90D0C9B78005FE2D8 /* PBXTextBookmark */; + 7EEF34FA0D0C9B78005FE2D8 /* PBXTextBookmark */ = 7EEF34FA0D0C9B78005FE2D8 /* PBXTextBookmark */; + 7EEF34FB0D0C9B97005FE2D8 /* PBXTextBookmark */ = 7EEF34FB0D0C9B97005FE2D8 /* PBXTextBookmark */; + 7EEF35000D0C9BDA005FE2D8 /* PBXTextBookmark */ = 7EEF35000D0C9BDA005FE2D8 /* PBXTextBookmark */; + 7EEF35010D0C9BDA005FE2D8 /* PBXTextBookmark */ = 7EEF35010D0C9BDA005FE2D8 /* PBXTextBookmark */; + 7EEF35020D0C9BDA005FE2D8 /* PBXTextBookmark */ = 7EEF35020D0C9BDA005FE2D8 /* PBXTextBookmark */; + 7EEF35030D0C9BDA005FE2D8 /* PBXTextBookmark */ = 7EEF35030D0C9BDA005FE2D8 /* PBXTextBookmark */; + 7EEF35040D0C9BDA005FE2D8 /* PBXTextBookmark */ = 7EEF35040D0C9BDA005FE2D8 /* PBXTextBookmark */; + 7EEF35050D0C9BDA005FE2D8 /* PBXTextBookmark */ = 7EEF35050D0C9BDA005FE2D8 /* PBXTextBookmark */; + 7EEF35060D0C9BDA005FE2D8 /* PBXTextBookmark */ = 7EEF35060D0C9BDA005FE2D8 /* PBXTextBookmark */; + 7EEF35080D0C9BE0005FE2D8 /* PBXTextBookmark */ = 7EEF35080D0C9BE0005FE2D8 /* PBXTextBookmark */; + 7EEF350A0D0C9BE2005FE2D8 /* PBXTextBookmark */ = 7EEF350A0D0C9BE2005FE2D8 /* PBXTextBookmark */; + 7EEF350B0D0C9CD5005FE2D8 /* PBXTextBookmark */ = 7EEF350B0D0C9CD5005FE2D8 /* PBXTextBookmark */; + 7EEF350C0D0C9CD5005FE2D8 /* PBXTextBookmark */ = 7EEF350C0D0C9CD5005FE2D8 /* PBXTextBookmark */; }; sourceControlManager = 7E8986DC0D08A3D10077F9ED /* Source Control */; userBuildSettings = { @@ -256,7 +192,7 @@ argumentStrings = ( ); autoAttachOnCrash = 1; - breakpointsEnabled = 1; + breakpointsEnabled = 0; configStateDict = { }; customDataFormattersEnabled = 1; @@ -305,9 +241,9 @@ }; 7E8987070D08B4640077F9ED /* PS2VM.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {488, 12684}}"; - sepNavSelRange = "{2805, 0}"; - sepNavVisRange = "{2607, 350}"; + sepNavIntBoundsRect = "{{0, 0}, {1011, 12698}}"; + sepNavSelRange = "{17100, 0}"; + sepNavVisRange = "{16902, 631}"; sepNavWindowFrame = "{{72, 60}, {1129, 677}}"; }; }; @@ -327,9 +263,9 @@ }; 7E8987B20D08BD090077F9ED /* BasicBlock.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {682, 1582}}"; - sepNavSelRange = "{102, 0}"; - sepNavVisRange = "{0, 340}"; + sepNavIntBoundsRect = "{{0, 0}, {1219, 1456}}"; + sepNavSelRange = "{1311, 0}"; + sepNavVisRange = "{1373, 496}"; }; }; 7E8987B30D08BD090077F9ED /* BasicBlock.h */ = { @@ -360,6 +296,13 @@ sepNavVisRange = "{0, 455}"; }; }; + 7E8987BF0D08BD090077F9ED /* Config.cpp */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1011, 6650}}"; + sepNavSelRange = "{264, 0}"; + sepNavVisRange = "{1800, 530}"; + }; + }; 7E8987C00D08BD090077F9ED /* COP_FPU.cpp */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1070, 7224}}"; @@ -452,6 +395,13 @@ sepNavWindowFrame = "{{15, 96}, {1129, 677}}"; }; }; + 7E89882D0D08BD090077F9ED /* Profiler.cpp */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1011, 2058}}"; + sepNavSelRange = "{172, 0}"; + sepNavVisRange = "{325, 514}"; + }; + }; 7E89882F0D08BD090077F9ED /* PS2OS.cpp */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1011, 38794}}"; @@ -459,6 +409,13 @@ sepNavVisRange = "{25049, 650}"; }; }; + 7E8988310D08BD090077F9ED /* RangeList16.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1011, 1092}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 553}"; + }; + }; 7E8988380D08BD090077F9ED /* Utils.cpp */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1219, 504}}"; @@ -548,36 +505,6 @@ sepNavVisRange = "{0, 55}"; }; }; - 7E947B230D09F99800A2AE15 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B160D09F8F100A2AE15 /* Globals.h */; - name = "Globals.h: 6"; - rLen = 0; - rLoc = 78; - rType = 0; - vrLen = 105; - vrLoc = 0; - }; - 7E947B240D09F99800A2AE15 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947ABD0D09F49A00A2AE15 /* main.mm */; - name = "main.mm: 7"; - rLen = 0; - rLoc = 114; - rType = 0; - vrLen = 175; - vrLoc = 0; - }; - 7E947B250D09F99800A2AE15 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B180D09F95600A2AE15 /* Globals.cpp */; - name = "Globals.cpp: 4"; - rLen = 0; - rLoc = 55; - rType = 0; - vrLen = 55; - vrLoc = 0; - }; 7E947B2E0D0A063200A2AE15 /* ApplicationDelegate.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1011, 427}}"; @@ -588,82 +515,12 @@ }; 7E947B2F0D0A063200A2AE15 /* ApplicationDelegate.mm */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1011, 560}}"; - sepNavSelRange = "{239, 0}"; - sepNavVisRange = "{0, 793}"; + sepNavIntBoundsRect = "{{0, 0}, {1011, 574}}"; + sepNavSelRange = "{80, 0}"; + sepNavVisRange = "{0, 880}"; sepNavWindowFrame = "{{15, 96}, {1129, 677}}"; }; }; - 7E947B390D0A073C00A2AE15 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B160D09F8F100A2AE15 /* Globals.h */; - name = "Globals.h: 6"; - rLen = 0; - rLoc = 78; - rType = 0; - vrLen = 105; - vrLoc = 0; - }; - 7E947B3A0D0A073C00A2AE15 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987FF0D08BD090077F9ED /* MA_EE.cpp */; - name = "MA_EE.cpp: 101"; - rLen = 2; - rLoc = 2300; - rType = 0; - vrLen = 525; - vrLoc = 2050; - }; - 7E947B3C0D0A073C00A2AE15 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947ABD0D09F49A00A2AE15 /* main.mm */; - name = "main.mm: 6"; - rLen = 0; - rLoc = 109; - rType = 0; - vrLen = 175; - vrLoc = 0; - }; - 7E947B400D0A073C00A2AE15 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987FF0D08BD090077F9ED /* MA_EE.cpp */; - name = "MA_EE.cpp: 101"; - rLen = 2; - rLoc = 2300; - rType = 0; - vrLen = 525; - vrLoc = 2050; - }; - 7E947B410D0A073C00A2AE15 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B2E0D0A063200A2AE15 /* ApplicationDelegate.h */; - name = "ApplicationDelegate.h: 3"; - rLen = 0; - rLoc = 37; - rType = 0; - vrLen = 80; - vrLoc = 0; - }; - 7E947B420D0A073C00A2AE15 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B2F0D0A063200A2AE15 /* ApplicationDelegate.mm */; - name = "ApplicationDelegate.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 76; - vrLoc = 0; - }; - 7E947B590D0A07F700A2AE15 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987B90D08BD090077F9ED /* CodeGen_FPU.h */; - name = "CodeGen_FPU.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 455; - vrLoc = 0; - }; 7E947B5C0D0A07F700A2AE15 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7E8987070D08B4640077F9ED /* PS2VM.cpp */; @@ -674,83 +531,6 @@ vrLen = 1004; vrLoc = 4954; }; - 7E947B5E0D0A07F700A2AE15 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987B90D08BD090077F9ED /* CodeGen_FPU.h */; - name = "CodeGen_FPU.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 455; - vrLoc = 0; - }; - 7E947B900D0A0CAA00A2AE15 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987070D08B4640077F9ED /* PS2VM.cpp */; - name = "PS2VM.cpp: 196"; - rLen = 0; - rLoc = 3656; - rType = 0; - vrLen = 347; - vrLoc = 2565; - }; - 7E947B9A0D0A0CAA00A2AE15 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E89882F0D08BD090077F9ED /* PS2OS.cpp */; - name = "PS2OS.cpp: 177"; - rLen = 0; - rLoc = 4138; - rType = 0; - vrLen = 506; - vrLoc = 3893; - }; - 7E947B9B0D0A0CAA00A2AE15 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B9C0D0A0CAA00A2AE15 /* path.hpp */; - name = "path.hpp: 395"; - rLen = 0; - rLoc = 14593; - rType = 0; - vrLen = 1048; - vrLoc = 14123; - }; - 7E947B9C0D0A0CAA00A2AE15 /* path.hpp */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.cpp.h; - name = path.hpp; - path = /Users/jpd001/Libraries/boost_1_34_1/boost/filesystem/path.hpp; - sourceTree = ""; - }; - 7E947BC70D0A121B00A2AE15 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B2E0D0A063200A2AE15 /* ApplicationDelegate.h */; - name = "ApplicationDelegate.h: 5"; - rLen = 0; - rLoc = 108; - rType = 0; - vrLen = 180; - vrLoc = 0; - }; - 7E947BF30D0A42C300A2AE15 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B9C0D0A0CAA00A2AE15 /* path.hpp */; - name = "path.hpp: 873"; - rLen = 0; - rLoc = 34188; - rType = 0; - vrLen = 1122; - vrLoc = 33672; - }; - 7E947C2F0D0A6B5A00A2AE15 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B2F0D0A063200A2AE15 /* ApplicationDelegate.mm */; - name = "ApplicationDelegate.mm: 29"; - rLen = 0; - rLoc = 916; - rType = 0; - vrLen = 644; - vrLoc = 0; - }; 7E947C390D0B4E3800A2AE15 /* GSH_OpenGL_Texture.cpp */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1011, 12642}}"; @@ -768,325 +548,18 @@ }; 7E947C3B0D0B4E3800A2AE15 /* GSH_OpenGL.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1011, 16198}}"; - sepNavSelRange = "{524, 0}"; - sepNavVisRange = "{223, 642}"; + sepNavIntBoundsRect = "{{0, 0}, {1011, 16758}}"; + sepNavSelRange = "{24230, 0}"; + sepNavVisRange = "{24148, 444}"; sepNavWindowFrame = "{{15, 96}, {1129, 677}}"; }; }; - 7E947C6F0D0B4F6200A2AE15 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987B10D08BD090077F9ED /* ArrayStack.h */; - name = "ArrayStack.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 530; - vrLoc = 0; - }; - 7E947C720D0B4F6200A2AE15 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947C730D0B4F6200A2AE15 /* OpenGL.h */; - name = "OpenGL.h: 10"; - rLen = 0; - rLoc = 196; - rType = 0; - vrLen = 730; - vrLoc = 0; - }; - 7E947C730D0B4F6200A2AE15 /* OpenGL.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = OpenGL.h; - path = /System/Library/Frameworks/OpenGL.framework/Headers/OpenGL.h; - sourceTree = ""; - }; - 7E947C770D0B4F6200A2AE15 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987B10D08BD090077F9ED /* ArrayStack.h */; - name = "ArrayStack.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 530; - vrLoc = 0; - }; - 7E947C780D0B4F6200A2AE15 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947C790D0B4F6200A2AE15 /* OpenGL.h */; - name = "OpenGL.h: 10"; - rLen = 0; - rLoc = 196; - rType = 0; - vrLen = 730; - vrLoc = 0; - }; 7E947C790D0B4F6200A2AE15 /* OpenGL.h */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OpenGL.h; path = /System/Library/Frameworks/OpenGL.framework/Headers/OpenGL.h; sourceTree = ""; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1118, 1974}}"; - sepNavSelRange = "{700, 0}"; - sepNavVisRange = "{351, 1840}"; - }; - }; - 7E947C7B0D0B4F6200A2AE15 /* gl.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = gl.h; - path = /System/Library/Frameworks/OpenGL.framework/Headers/gl.h; - sourceTree = ""; - }; - 7EE203520D0B5296002D2B72 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947C7B0D0B4F6200A2AE15 /* gl.h */; - name = "gl.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1369; - vrLoc = 0; - }; - 7EE203540D0B5296002D2B72 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947C7B0D0B4F6200A2AE15 /* gl.h */; - name = "gl.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1369; - vrLoc = 0; - }; - 7EE203650D0B8AA4002D2B72 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947C390D0B4E3800A2AE15 /* GSH_OpenGL_Texture.cpp */; - name = "GSH_OpenGL_Texture.cpp: 48"; - rLen = 0; - rLoc = 1040; - rType = 0; - vrLen = 717; - vrLoc = 0; - }; - 7EE203660D0B8AA4002D2B72 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987B30D08BD090077F9ED /* BasicBlock.h */; - name = "BasicBlock.h: 27"; - rLen = 0; - rLoc = 541; - rType = 0; - vrLen = 541; - vrLoc = 0; - }; - 7EE203680D0B8AA4002D2B72 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947C390D0B4E3800A2AE15 /* GSH_OpenGL_Texture.cpp */; - name = "GSH_OpenGL_Texture.cpp: 48"; - rLen = 0; - rLoc = 1040; - rType = 0; - vrLen = 717; - vrLoc = 0; - }; - 7EE203690D0B8AA4002D2B72 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987B30D08BD090077F9ED /* BasicBlock.h */; - name = "BasicBlock.h: 27"; - rLen = 0; - rLoc = 541; - rType = 0; - vrLen = 541; - vrLoc = 0; - }; - 7EE203720D0B8B59002D2B72 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E89882F0D08BD090077F9ED /* PS2OS.cpp */; - name = "PS2OS.cpp: 452"; - rLen = 82; - rLoc = 9459; - rType = 0; - vrLen = 528; - vrLoc = 9144; - }; - 7EE203730D0B8B59002D2B72 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987080D08B4640077F9ED /* PS2VM.h */; - name = "PS2VM.h: 17"; - rLen = 27; - rLoc = 351; - rType = 0; - vrLen = 618; - vrLoc = 0; - }; - 7EE203740D0B8B59002D2B72 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B180D09F95600A2AE15 /* Globals.cpp */; - name = "Globals.cpp: 4"; - rLen = 0; - rLoc = 55; - rType = 0; - vrLen = 55; - vrLoc = 0; - }; - 7EE203750D0B8B59002D2B72 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E89882F0D08BD090077F9ED /* PS2OS.cpp */; - name = "PS2OS.cpp: 452"; - rLen = 82; - rLoc = 9459; - rType = 0; - vrLen = 528; - vrLoc = 9144; - }; - 7EE203760D0B8B59002D2B72 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987080D08B4640077F9ED /* PS2VM.h */; - name = "PS2VM.h: 17"; - rLen = 27; - rLoc = 351; - rType = 0; - vrLen = 618; - vrLoc = 0; - }; - 7EE203770D0B8B59002D2B72 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B180D09F95600A2AE15 /* Globals.cpp */; - name = "Globals.cpp: 4"; - rLen = 0; - rLoc = 55; - rType = 0; - vrLen = 55; - vrLoc = 0; - }; - 7EE2037C0D0B8B6F002D2B72 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B2F0D0A063200A2AE15 /* ApplicationDelegate.mm */; - name = "ApplicationDelegate.mm: 24"; - rLen = 0; - rLoc = 753; - rType = 0; - vrLen = 782; - vrLoc = 53; - }; - 7EEF32FA0D0B8B93005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B2F0D0A063200A2AE15 /* ApplicationDelegate.mm */; - name = "ApplicationDelegate.mm: 26"; - rLen = 0; - rLoc = 814; - rType = 0; - vrLen = 776; - vrLoc = 53; - }; - 7EEF333E0D0B8CF4005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF333F0D0B8CF4005FE2D8 /* mem_fn_template.hpp */; - name = "mem_fn_template.hpp: 49"; - rLen = 0; - rLoc = 1084; - rType = 0; - vrLen = 611; - vrLoc = 738; - }; - 7EEF333F0D0B8CF4005FE2D8 /* mem_fn_template.hpp */ = { - isa = PBXFileReference; - name = mem_fn_template.hpp; - path = /Users/jpd001/Libraries/boost_1_34_1/boost/bind/mem_fn_template.hpp; - sourceTree = ""; - }; - 7EEF33400D0B8CF4005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF33410D0B8CF4005FE2D8 /* bind.hpp */; - name = "bind.hpp: 231"; - rLen = 0; - rLoc = 5773; - rType = 0; - vrLen = 874; - vrLoc = 5345; - }; - 7EEF33410D0B8CF4005FE2D8 /* bind.hpp */ = { - isa = PBXFileReference; - name = bind.hpp; - path = /Users/jpd001/Libraries/boost_1_34_1/boost/bind.hpp; - sourceTree = ""; - }; - 7EEF33420D0B8CF4005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF33430D0B8CF4005FE2D8 /* bind_template.hpp */; - name = "bind_template.hpp: 20"; - rLen = 0; - rLoc = 504; - rType = 0; - vrLen = 763; - vrLoc = 0; - }; - 7EEF33430D0B8CF4005FE2D8 /* bind_template.hpp */ = { - isa = PBXFileReference; - name = bind_template.hpp; - path = /Users/jpd001/Libraries/boost_1_34_1/boost/bind/bind_template.hpp; - sourceTree = ""; - }; - 7EEF33440D0B8CF4005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF33450D0B8CF4005FE2D8 /* function_template.hpp */; - name = "function_template.hpp: 155"; - rLen = 0; - rLoc = 5705; - rType = 0; - vrLen = 1191; - vrLoc = 22328; - }; - 7EEF33450D0B8CF4005FE2D8 /* function_template.hpp */ = { - isa = PBXFileReference; - name = function_template.hpp; - path = /Users/jpd001/Libraries/boost_1_34_1/boost/function/function_template.hpp; - sourceTree = ""; - }; - 7EEF33460D0B8CF4005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E89880C0D08BD090077F9ED /* MailBox.cpp */; - name = "MailBox.cpp: 76"; - rLen = 0; - rLoc = 1603; - rType = 0; - vrLen = 629; - vrLoc = 1083; - }; - 7EEF33470D0B8CF4005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B2F0D0A063200A2AE15 /* ApplicationDelegate.mm */; - name = "ApplicationDelegate.mm: 27"; - rLen = 0; - rLoc = 855; - rType = 0; - vrLen = 776; - vrLoc = 53; - }; - 7EEF33480D0B8CF4005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987070D08B4640077F9ED /* PS2VM.cpp */; - name = "PS2VM.cpp: 427"; - rLen = 0; - rLoc = 9718; - rType = 0; - vrLen = 509; - vrLoc = 9409; - }; - 7EEF33490D0B8CF4005FE2D8 /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 7E8987FB0D08BD090077F9ED /* Log.cpp */; - }; - 7EEF334A0D0B8CF4005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B2F0D0A063200A2AE15 /* ApplicationDelegate.mm */; - name = "ApplicationDelegate.mm: 26"; - rLen = 0; - rLoc = 814; - rType = 0; - vrLen = 776; - vrLoc = 53; }; 7EEF334B0D0B8CF4005FE2D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; @@ -1098,80 +571,6 @@ vrLen = 472; vrLoc = 9386; }; - 7EEF334C0D0B8CF4005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF334D0D0B8CF4005FE2D8 /* mem_fn_template.hpp */; - name = "mem_fn_template.hpp: 49"; - rLen = 0; - rLoc = 1084; - rType = 0; - vrLen = 611; - vrLoc = 738; - }; - 7EEF334D0D0B8CF4005FE2D8 /* mem_fn_template.hpp */ = { - isa = PBXFileReference; - name = mem_fn_template.hpp; - path = /Users/jpd001/Libraries/boost_1_34_1/boost/bind/mem_fn_template.hpp; - sourceTree = ""; - }; - 7EEF334E0D0B8CF4005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF334F0D0B8CF4005FE2D8 /* bind.hpp */; - name = "bind.hpp: 231"; - rLen = 0; - rLoc = 5773; - rType = 0; - vrLen = 874; - vrLoc = 5345; - }; - 7EEF334F0D0B8CF4005FE2D8 /* bind.hpp */ = { - isa = PBXFileReference; - name = bind.hpp; - path = /Users/jpd001/Libraries/boost_1_34_1/boost/bind.hpp; - sourceTree = ""; - }; - 7EEF33500D0B8CF4005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF33510D0B8CF4005FE2D8 /* bind_template.hpp */; - name = "bind_template.hpp: 20"; - rLen = 0; - rLoc = 504; - rType = 0; - vrLen = 763; - vrLoc = 0; - }; - 7EEF33510D0B8CF4005FE2D8 /* bind_template.hpp */ = { - isa = PBXFileReference; - name = bind_template.hpp; - path = /Users/jpd001/Libraries/boost_1_34_1/boost/bind/bind_template.hpp; - sourceTree = ""; - }; - 7EEF33520D0B8CF4005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF33530D0B8CF4005FE2D8 /* function_template.hpp */; - name = "function_template.hpp: 155"; - rLen = 0; - rLoc = 5705; - rType = 0; - vrLen = 1191; - vrLoc = 22328; - }; - 7EEF33530D0B8CF4005FE2D8 /* function_template.hpp */ = { - isa = PBXFileReference; - name = function_template.hpp; - path = /Users/jpd001/Libraries/boost_1_34_1/boost/function/function_template.hpp; - sourceTree = ""; - }; - 7EEF33540D0B8CF4005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E89880C0D08BD090077F9ED /* MailBox.cpp */; - name = "MailBox.cpp: 76"; - rLen = 0; - rLoc = 1603; - rType = 0; - vrLen = 629; - vrLoc = 1083; - }; 7EEF33550D0B8CF4005FE2D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7E8987070D08B4640077F9ED /* PS2VM.cpp */; @@ -1182,16 +581,6 @@ vrLen = 617; vrLoc = 16925; }; - 7EEF33560D0B8CF4005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B2F0D0A063200A2AE15 /* ApplicationDelegate.mm */; - name = "ApplicationDelegate.mm: 27"; - rLen = 0; - rLoc = 850; - rType = 0; - vrLen = 776; - vrLoc = 53; - }; 7EEF33570D0B8CF4005FE2D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7E8987070D08B4640077F9ED /* PS2VM.cpp */; @@ -1202,16 +591,6 @@ vrLen = 428; vrLoc = 9433; }; - 7EEF33580D0B8CF4005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B2F0D0A063200A2AE15 /* ApplicationDelegate.mm */; - name = "ApplicationDelegate.mm: 27"; - rLen = 0; - rLoc = 855; - rType = 0; - vrLen = 776; - vrLoc = 53; - }; 7EEF33590D0B8CF4005FE2D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7E8987070D08B4640077F9ED /* PS2VM.cpp */; @@ -1222,113 +601,6 @@ vrLen = 509; vrLoc = 9409; }; - 7EEF335A0D0B8CF4005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987FB0D08BD090077F9ED /* Log.cpp */; - name = "Log.cpp: 42"; - rLen = 0; - rLoc = 714; - rType = 0; - vrLen = 718; - vrLoc = 166; - }; - 7EEF335E0D0B8D2E005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987FB0D08BD090077F9ED /* Log.cpp */; - name = "Log.cpp: 40"; - rLen = 0; - rLoc = 667; - rType = 0; - vrLen = 659; - vrLoc = 164; - }; - 7EEF33640D0B8D6E005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987FB0D08BD090077F9ED /* Log.cpp */; - name = "Log.cpp: 40"; - rLen = 0; - rLoc = 674; - rType = 0; - vrLen = 642; - vrLoc = 184; - }; - 7EEF33650D0B8D6E005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987070D08B4640077F9ED /* PS2VM.cpp */; - rLen = 0; - rLoc = 603; - rType = 1; - }; - 7EEF33660D0B8D6E005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987FB0D08BD090077F9ED /* Log.cpp */; - name = "Log.cpp: 40"; - rLen = 0; - rLoc = 674; - rType = 0; - vrLen = 642; - vrLoc = 184; - }; - 7EEF33670D0B8D6E005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987070D08B4640077F9ED /* PS2VM.cpp */; - name = "PS2VM.cpp: 599"; - rLen = 0; - rLoc = 13427; - rType = 0; - vrLen = 673; - vrLoc = 12956; - }; - 7EEF336A0D0B8D9A005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987070D08B4640077F9ED /* PS2VM.cpp */; - name = "PS2VM.cpp: 532"; - rLen = 0; - rLoc = 11849; - rType = 0; - vrLen = 674; - vrLoc = 11746; - }; - 7EEF33810D0B8EDA005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E89882F0D08BD090077F9ED /* PS2OS.cpp */; - name = "PS2OS.cpp: 1188"; - rLen = 0; - rLoc = 25049; - rType = 0; - vrLen = 650; - vrLoc = 25049; - }; - 7EEF33820D0B8EDA005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987D00D08BD090077F9ED /* GIF.cpp */; - name = "GIF.cpp: 186"; - rLen = 0; - rLoc = 3537; - rType = 0; - vrLen = 558; - vrLoc = 3232; - }; - 7EEF33830D0B8EDA005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987D40D08BD090077F9ED /* GSHandler.cpp */; - name = "GSHandler.cpp: 219"; - rLen = 0; - rLoc = 4850; - rType = 0; - vrLen = 527; - vrLoc = 4514; - }; - 7EEF33840D0B8EDA005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987070D08B4640077F9ED /* PS2VM.cpp */; - name = "PS2VM.cpp: 778"; - rLen = 0; - rLoc = 17101; - rType = 0; - vrLen = 673; - vrLoc = 16817; - }; 7EEF33850D0B8EDA005FE2D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7E8987070D08B4640077F9ED /* PS2VM.cpp */; @@ -1339,26 +611,6 @@ vrLen = 674; vrLoc = 11746; }; - 7EEF33860D0B8EDA005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E89882F0D08BD090077F9ED /* PS2OS.cpp */; - name = "PS2OS.cpp: 1188"; - rLen = 0; - rLoc = 25049; - rType = 0; - vrLen = 650; - vrLoc = 25049; - }; - 7EEF33870D0B8EDA005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987D00D08BD090077F9ED /* GIF.cpp */; - name = "GIF.cpp: 186"; - rLen = 0; - rLoc = 3537; - rType = 0; - vrLen = 558; - vrLoc = 3232; - }; 7EEF33880D0B8EDA005FE2D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7E8987070D08B4640077F9ED /* PS2VM.cpp */; @@ -1369,29 +621,9 @@ vrLen = 673; vrLoc = 16817; }; - 7EEF33890D0B8EDA005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987D40D08BD090077F9ED /* GSHandler.cpp */; - name = "GSHandler.cpp: 219"; - rLen = 0; - rLoc = 4850; - rType = 0; - vrLen = 527; - vrLoc = 4514; - }; - 7EEF338A0D0B8EDA005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987070D08B4640077F9ED /* PS2VM.cpp */; - name = "PS2VM.cpp: 802"; - rLen = 0; - rLoc = 17605; - rType = 0; - vrLen = 596; - vrLoc = 17093; - }; 7EEF338C0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1011, 427}}"; + sepNavIntBoundsRect = "{{0, 0}, {1011, 404}}"; sepNavSelRange = "{0, 1}"; sepNavVisRange = "{0, 438}"; sepNavWindowFrame = "{{15, 96}, {1129, 677}}"; @@ -1399,69 +631,11 @@ }; 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1011, 490}}"; - sepNavSelRange = "{368, 0}"; - sepNavVisRange = "{112, 534}"; + sepNavIntBoundsRect = "{{0, 0}, {1011, 476}}"; + sepNavSelRange = "{28, 0}"; + sepNavVisRange = "{0, 561}"; }; }; - 7EEF33B70D0B90E8005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; - name = "GSH_OpenGLMacOSX.cpp: 3"; - rLen = 62; - rLoc = 31; - rType = 0; - vrLen = 163; - vrLoc = 0; - }; - 7EEF33B80D0B90E8005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - comments = "error: field 'CGLContextObj' has incomplete type"; - fRef = 7EEF338C0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.h */; - rLen = 1; - rLoc = 8; - rType = 1; - }; - 7EEF33B90D0B90E8005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF338C0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.h */; - name = "GSH_OpenGLMacOSX.h: 14"; - rLen = 29; - rLoc = 398; - rType = 0; - vrLen = 292; - vrLoc = 0; - }; - 7EEF33BA0D0B90E8005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; - name = "GSH_OpenGLMacOSX.cpp: 3"; - rLen = 62; - rLoc = 31; - rType = 0; - vrLen = 163; - vrLoc = 0; - }; - 7EEF33BB0D0B90E8005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF338C0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.h */; - name = "GSH_OpenGLMacOSX.h: 10"; - rLen = 13; - rLoc = 167; - rType = 0; - vrLen = 292; - vrLoc = 0; - }; - 7EEF33BE0D0B9163005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF338C0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.h */; - name = "GSH_OpenGLMacOSX.h: 10"; - rLen = 13; - rLoc = 167; - rType = 0; - vrLen = 460; - vrLoc = 0; - }; 7EEF33EA0D0B93B4005FE2D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7E8987070D08B4640077F9ED /* PS2VM.cpp */; @@ -1484,6 +658,7 @@ }; 7EEF33EC0D0B93B4005FE2D8 /* CGLMacro.h */ = { isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; name = CGLMacro.h; path = /System/Library/Frameworks/OpenGL.framework/Headers/CGLMacro.h; sourceTree = ""; @@ -1510,6 +685,7 @@ }; 7EEF33EF0D0B93B4005FE2D8 /* CGLProfilerFunctionEnum.h */ = { isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; name = CGLProfilerFunctionEnum.h; path = /System/Library/Frameworks/OpenGL.framework/Headers/CGLProfilerFunctionEnum.h; sourceTree = ""; @@ -1536,30 +712,11 @@ }; 7EEF33F20D0B93B4005FE2D8 /* GSH_OpenGLMacOSX.i */ = { isa = PBXFileReference; + lastKnownFileType = file; name = GSH_OpenGLMacOSX.i; path = "/Users/jpd001/Projects/Purei/build/Purei.build/Debug/Purei.build/Objects-normal/i386/GSH_OpenGLMacOSX.i"; sourceTree = ""; }; - 7EEF33F30D0B93B4005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; - name = "GSH_OpenGLMacOSX.cpp: 2"; - rLen = 0; - rLoc = 30; - rType = 0; - vrLen = 357; - vrLoc = 0; - }; - 7EEF33F40D0B93B4005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF338C0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.h */; - name = "GSH_OpenGLMacOSX.h: 5"; - rLen = 0; - rLoc = 86; - rType = 0; - vrLen = 438; - vrLoc = 0; - }; 7EEF33F50D0B93B4005FE2D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7E8987B30D08BD090077F9ED /* BasicBlock.h */; @@ -1580,26 +737,6 @@ vrLen = 578; vrLoc = 705; }; - 7EEF33F70D0B93B4005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947C3B0D0B4E3800A2AE15 /* GSH_OpenGL.cpp */; - name = "GSH_OpenGL.cpp: 734"; - rLen = 44; - rLoc = 15254; - rType = 0; - vrLen = 803; - vrLoc = 15101; - }; - 7EEF33F80D0B93B4005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947C3A0D0B4E3800A2AE15 /* GSH_OpenGL.h */; - name = "GSH_OpenGL.h: 10"; - rLen = 0; - rLoc = 220; - rType = 0; - vrLen = 906; - vrLoc = 0; - }; 7EEF33F90D0B93B4005FE2D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7E8987070D08B4640077F9ED /* PS2VM.cpp */; @@ -1647,7 +784,7 @@ rLen = 0; rLoc = 430; rType = 0; - vrLen = 467; + vrLen = 438; vrLoc = 0; }; 7EEF33FE0D0B93B4005FE2D8 /* PBXTextBookmark */ = { @@ -1662,6 +799,7 @@ }; 7EEF33FF0D0B93B4005FE2D8 /* CGLMacro.h */ = { isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; name = CGLMacro.h; path = /System/Library/Frameworks/OpenGL.framework/Headers/CGLMacro.h; sourceTree = ""; @@ -1673,7 +811,7 @@ rLen = 0; rLoc = 430; rType = 0; - vrLen = 467; + vrLen = 438; vrLoc = 0; }; 7EEF34010D0B93B4005FE2D8 /* PBXTextBookmark */ = { @@ -1708,6 +846,7 @@ }; 7EEF34040D0B93B4005FE2D8 /* CGLProfilerFunctionEnum.h */ = { isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; name = CGLProfilerFunctionEnum.h; path = /System/Library/Frameworks/OpenGL.framework/Headers/CGLProfilerFunctionEnum.h; sourceTree = ""; @@ -1744,6 +883,7 @@ }; 7EEF34080D0B93B4005FE2D8 /* GSH_OpenGLMacOSX.i */ = { isa = PBXFileReference; + lastKnownFileType = file; name = GSH_OpenGLMacOSX.i; path = "/Users/jpd001/Projects/Purei/build/Purei.build/Debug/Purei.build/Objects-normal/i386/GSH_OpenGLMacOSX.i"; sourceTree = ""; @@ -1765,7 +905,7 @@ rLen = 0; rLoc = 430; rType = 0; - vrLen = 467; + vrLen = 438; vrLoc = 0; }; 7EEF340B0D0B93B4005FE2D8 /* PBXTextBookmark */ = { @@ -1848,54 +988,6 @@ vrLen = 803; vrLoc = 15101; }; - 7EEF34130D0B93B4005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947C3A0D0B4E3800A2AE15 /* GSH_OpenGL.h */; - name = "GSH_OpenGL.h: 10"; - rLen = 0; - rLoc = 220; - rType = 0; - vrLen = 906; - vrLoc = 0; - }; - 7EEF34140D0B9415005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF338C0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.h */; - name = "GSH_OpenGLMacOSX.h: 9"; - rLen = 13; - rLoc = 167; - rType = 0; - vrLen = 438; - vrLoc = 0; - }; - 7EEF34150D0B9415005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - comments = "warning: invalid access to non-static data member 'CMIPS::m_pTickFunction' of NULL object"; - fRef = 7E8987B40D08BD090077F9ED /* CacheBlock.cpp */; - rLen = 1; - rLoc = 192; - rType = 1; - }; - 7EEF34160D0B9415005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF338C0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.h */; - name = "GSH_OpenGLMacOSX.h: 9"; - rLen = 13; - rLoc = 167; - rType = 0; - vrLen = 438; - vrLoc = 0; - }; - 7EEF34170D0B9415005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987B40D08BD090077F9ED /* CacheBlock.cpp */; - name = "CacheBlock.cpp: 193"; - rLen = 54; - rLoc = 3917; - rType = 0; - vrLen = 415; - vrLoc = 3662; - }; 7EEF34180D0B9417005FE2D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7E947C3A0D0B4E3800A2AE15 /* GSH_OpenGL.h */; @@ -1906,34 +998,6 @@ vrLen = 906; vrLoc = 0; }; - 7EEF34190D0B9417005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF338C0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.h */; - name = "GSH_OpenGLMacOSX.h: 5"; - rLen = 0; - rLoc = 86; - rType = 0; - vrLen = 438; - vrLoc = 0; - }; - 7EEF341A0D0B9417005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; - name = "GSH_OpenGLMacOSX.cpp: 10"; - rLen = 0; - rLoc = 159; - rType = 0; - vrLen = 357; - vrLoc = 0; - }; - 7EEF341B0D0B9417005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - comments = "warning: invalid access to non-static data member 'CMIPS::m_State' of NULL object"; - fRef = 7E8987B40D08BD090077F9ED /* CacheBlock.cpp */; - rLen = 1; - rLoc = 125; - rType = 1; - }; 7EEF341C0D0B9417005FE2D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7E947C3A0D0B4E3800A2AE15 /* GSH_OpenGL.h */; @@ -1964,54 +1028,6 @@ vrLen = 357; vrLoc = 0; }; - 7EEF341F0D0B9417005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987B40D08BD090077F9ED /* CacheBlock.cpp */; - name = "CacheBlock.cpp: 126"; - rLen = 93; - rLoc = 2179; - rType = 0; - vrLen = 925; - vrLoc = 1899; - }; - 7EEF34230D0B94DB005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987B40D08BD090077F9ED /* CacheBlock.cpp */; - name = "CacheBlock.cpp: 193"; - rLen = 54; - rLoc = 3917; - rType = 0; - vrLen = 415; - vrLoc = 3662; - }; - 7EEF34240D0B94DB005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - comments = "error: expected constructor, destructor, or type conversion before '*' token"; - fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; - rLen = 1; - rLoc = 30; - rType = 1; - }; - 7EEF34250D0B94DB005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987B40D08BD090077F9ED /* CacheBlock.cpp */; - name = "CacheBlock.cpp: 193"; - rLen = 54; - rLoc = 3917; - rType = 0; - vrLen = 415; - vrLoc = 3662; - }; - 7EEF34260D0B94DB005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; - name = "GSH_OpenGLMacOSX.cpp: 31"; - rLen = 0; - rLoc = 511; - rType = 0; - vrLen = 395; - vrLoc = 251; - }; 7EEF34290D0B94EB005FE2D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7E8987B40D08BD090077F9ED /* CacheBlock.cpp */; @@ -2112,56 +1128,6 @@ vrLen = 438; vrLoc = 0; }; - 7EEF34330D0B94EB005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; - name = "GSH_OpenGLMacOSX.cpp: 26"; - rLen = 0; - rLoc = 464; - rType = 0; - vrLen = 509; - vrLoc = 0; - }; - 7EEF344C0D0B956F005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; - name = "GSH_OpenGLMacOSX.cpp: 26"; - rLen = 0; - rLoc = 464; - rType = 0; - vrLen = 571; - vrLoc = 0; - }; - 7EEF344D0D0B956F005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E8987FF0D08BD090077F9ED /* MA_EE.cpp */; - name = "MA_EE.cpp: 101"; - rLen = 2; - rLoc = 2300; - rType = 0; - vrLen = 637; - vrLoc = 2007; - }; - 7EEF344E0D0B956F005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B2E0D0A063200A2AE15 /* ApplicationDelegate.h */; - name = "ApplicationDelegate.h: 5"; - rLen = 0; - rLoc = 107; - rType = 0; - vrLen = 217; - vrLoc = 0; - }; - 7EEF344F0D0B956F005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B2F0D0A063200A2AE15 /* ApplicationDelegate.mm */; - name = "ApplicationDelegate.mm: 27"; - rLen = 0; - rLoc = 855; - rType = 0; - vrLen = 780; - vrLoc = 52; - }; 7EEF34500D0B956F005FE2D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; @@ -2222,36 +1188,6 @@ vrLen = 217; vrLoc = 0; }; - 7EEF34560D0B956F005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B2F0D0A063200A2AE15 /* ApplicationDelegate.mm */; - name = "ApplicationDelegate.mm: 10"; - rLen = 0; - rLoc = 226; - rType = 0; - vrLen = 698; - vrLoc = 52; - }; - 7EEF34610D0B957C005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; - name = "GSH_OpenGLMacOSX.cpp: 31"; - rLen = 0; - rLoc = 511; - rType = 0; - vrLen = 483; - vrLoc = 163; - }; - 7EEF34630D0B959B005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B2F0D0A063200A2AE15 /* ApplicationDelegate.mm */; - name = "ApplicationDelegate.mm: 2"; - rLen = 0; - rLoc = 60; - rType = 0; - vrLen = 703; - vrLoc = 0; - }; 7EEF34660D0B95E5005FE2D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7E947B2E0D0A063200A2AE15 /* ApplicationDelegate.h */; @@ -2262,16 +1198,6 @@ vrLen = 217; vrLoc = 0; }; - 7EEF34670D0B95E5005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B2F0D0A063200A2AE15 /* ApplicationDelegate.mm */; - name = "ApplicationDelegate.mm: 14"; - rLen = 0; - rLoc = 460; - rType = 0; - vrLen = 826; - vrLoc = 0; - }; 7EEF34680D0B95E5005FE2D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7E947B2F0D0A063200A2AE15 /* ApplicationDelegate.mm */; @@ -2292,46 +1218,6 @@ vrLen = 217; vrLoc = 0; }; - 7EEF346A0D0B95E5005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B2F0D0A063200A2AE15 /* ApplicationDelegate.mm */; - name = "ApplicationDelegate.mm: 14"; - rLen = 0; - rLoc = 457; - rType = 0; - vrLen = 793; - vrLoc = 0; - }; - 7EEF34770D0B961A005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; - name = "GSH_OpenGLMacOSX.cpp: 31"; - rLen = 0; - rLoc = 511; - rType = 0; - vrLen = 483; - vrLoc = 163; - }; - 7EEF347A0D0B963A005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E947B2F0D0A063200A2AE15 /* ApplicationDelegate.mm */; - name = "ApplicationDelegate.mm: 14"; - rLen = 0; - rLoc = 457; - rType = 0; - vrLen = 793; - vrLoc = 0; - }; - 7EEF347B0D0B963A005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; - name = "GSH_OpenGLMacOSX.cpp: 21"; - rLen = 0; - rLoc = 376; - rType = 0; - vrLen = 531; - vrLoc = 115; - }; 7EEF347C0D0B963A005FE2D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7E947C3B0D0B4E3800A2AE15 /* GSH_OpenGL.cpp */; @@ -2362,10 +1248,6 @@ vrLen = 637; vrLoc = 2007; }; - 7EEF347F0D0B963A005FE2D8 /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 7E89880C0D08BD090077F9ED /* MailBox.cpp */; - }; 7EEF34800D0B963A005FE2D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7E947B2F0D0A063200A2AE15 /* ApplicationDelegate.mm */; @@ -2416,16 +1298,6 @@ vrLen = 637; vrLoc = 2007; }; - 7EEF34850D0B963A005FE2D8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7E89880C0D08BD090077F9ED /* MailBox.cpp */; - name = "MailBox.cpp: 51"; - rLen = 0; - rLoc = 990; - rType = 0; - vrLen = 828; - vrLoc = 342; - }; 7EEF34890D0B9645005FE2D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7E89880C0D08BD090077F9ED /* MailBox.cpp */; @@ -2473,36 +1345,428 @@ vrLen = 793; vrLoc = 0; }; - 7EEF348E0D0B9645005FE2D8 /* PBXTextBookmark */ = { + 7EEF34960D0C96F0005FE2D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; - name = "GSH_OpenGLMacOSX.cpp: 21"; + name = "GSH_OpenGLMacOSX.cpp: 12"; rLen = 0; - rLoc = 368; + rLoc = 162; rType = 0; - vrLen = 531; - vrLoc = 115; + vrLen = 571; + vrLoc = 0; }; - 7EEF34900D0B97BD005FE2D8 /* PBXTextBookmark */ = { + 7EEF34B80D0C9828005FE2D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; - name = "GSH_OpenGLMacOSX.cpp: 31"; + comments = "error: block assembly operand not recognized"; + fRef = 7E8987B20D08BD090077F9ED /* BasicBlock.cpp */; + rLen = 1; + rLoc = 69; + rType = 1; + }; + 7EEF34B90D0C9828005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E8987B20D08BD090077F9ED /* BasicBlock.cpp */; + name = "BasicBlock.cpp: 60"; rLen = 0; - rLoc = 511; + rLoc = 1311; rType = 0; - vrLen = 483; - vrLoc = 163; + vrLen = 496; + vrLoc = 1373; }; - 7EEF34910D0B97C0005FE2D8 /* PBXTextBookmark */ = { + 7EEF34BC0D0C9831005FE2D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; - name = "GSH_OpenGLMacOSX.cpp: 21"; + name = "GSH_OpenGLMacOSX.cpp: 12"; rLen = 0; - rLoc = 368; + rLoc = 162; + rType = 0; + vrLen = 571; + vrLoc = 0; + }; + 7EEF34BD0D0C9831005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; + name = "GSH_OpenGLMacOSX.cpp: 12"; + rLen = 0; + rLoc = 162; + rType = 0; + vrLen = 571; + vrLoc = 0; + }; + 7EEF34BE0D0C9831005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E8987B20D08BD090077F9ED /* BasicBlock.cpp */; + name = "BasicBlock.cpp: 70"; + rLen = 34; + rLoc = 1477; + rType = 0; + vrLen = 656; + vrLoc = 1203; + }; + 7EEF34CE0D0C99F1005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E8987B20D08BD090077F9ED /* BasicBlock.cpp */; + name = "BasicBlock.cpp: 73"; + rLen = 0; + rLoc = 1555; + rType = 0; + vrLen = 666; + vrLoc = 1203; + }; + 7EEF34CF0D0C99F1005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E947B2F0D0A063200A2AE15 /* ApplicationDelegate.mm */; + name = "ApplicationDelegate.mm: 3"; + rLen = 0; + rLoc = 80; + rType = 0; + vrLen = 880; + vrLoc = 0; + }; + 7EEF34D00D0C99F1005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7EEF338C0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.h */; + name = "GSH_OpenGLMacOSX.h: 1"; + rLen = 1; + rLoc = 0; + rType = 0; + vrLen = 438; + vrLoc = 0; + }; + 7EEF34D10D0C99F1005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; + name = "GSH_OpenGLMacOSX.cpp: 27"; + rLen = 0; + rLoc = 465; rType = 0; vrLen = 534; vrLoc = 112; }; + 7EEF34D20D0C99F1005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E8987B20D08BD090077F9ED /* BasicBlock.cpp */; + name = "BasicBlock.cpp: 73"; + rLen = 0; + rLoc = 1555; + rType = 0; + vrLen = 666; + vrLoc = 1203; + }; + 7EEF34D30D0C99F1005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7EEF338C0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.h */; + name = "GSH_OpenGLMacOSX.h: 1"; + rLen = 1; + rLoc = 0; + rType = 0; + vrLen = 438; + vrLoc = 0; + }; + 7EEF34D40D0C99F1005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; + name = "GSH_OpenGLMacOSX.cpp: 27"; + rLen = 0; + rLoc = 465; + rType = 0; + vrLen = 534; + vrLoc = 112; + }; + 7EEF34D50D0C99F1005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E947B2F0D0A063200A2AE15 /* ApplicationDelegate.mm */; + name = "ApplicationDelegate.mm: 3"; + rLen = 0; + rLoc = 80; + rType = 0; + vrLen = 880; + vrLoc = 0; + }; + 7EEF34D60D0C99F1005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7EEF338C0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.h */; + name = "GSH_OpenGLMacOSX.h: 1"; + rLen = 1; + rLoc = 0; + rType = 0; + vrLen = 438; + vrLoc = 0; + }; + 7EEF34D70D0C99F1005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; + name = "GSH_OpenGLMacOSX.cpp: 27"; + rLen = 0; + rLoc = 465; + rType = 0; + vrLen = 541; + vrLoc = 93; + }; + 7EEF34DF0D0C9A4E005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; + name = "GSH_OpenGLMacOSX.cpp: 27"; + rLen = 0; + rLoc = 485; + rType = 0; + vrLen = 541; + vrLoc = 93; + }; + 7EEF34ED0D0C9B77005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E8987B20D08BD090077F9ED /* BasicBlock.cpp */; + name = "BasicBlock.cpp: 60"; + rLen = 0; + rLoc = 1311; + rType = 0; + vrLen = 496; + vrLoc = 1373; + }; + 7EEF34EE0D0C9B78005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7EEF338C0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.h */; + name = "GSH_OpenGLMacOSX.h: 1"; + rLen = 1; + rLoc = 0; + rType = 0; + vrLen = 438; + vrLoc = 0; + }; + 7EEF34EF0D0C9B78005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; + name = "GSH_OpenGLMacOSX.cpp: 27"; + rLen = 0; + rLoc = 471; + rType = 0; + vrLen = 539; + vrLoc = 93; + }; + 7EEF34F00D0C9B78005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E8988310D08BD090077F9ED /* RangeList16.h */; + name = "RangeList16.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 553; + vrLoc = 0; + }; + 7EEF34F10D0C9B78005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E89882D0D08BD090077F9ED /* Profiler.cpp */; + name = "Profiler.cpp: 14"; + rLen = 0; + rLoc = 172; + rType = 0; + vrLen = 514; + vrLoc = 325; + }; + 7EEF34F20D0C9B78005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E8987070D08B4640077F9ED /* PS2VM.cpp */; + name = "PS2VM.cpp: 778"; + rLen = 0; + rLoc = 17110; + rType = 0; + vrLen = 667; + vrLoc = 16902; + }; + 7EEF34F30D0C9B78005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E947C3B0D0B4E3800A2AE15 /* GSH_OpenGL.cpp */; + rLen = 0; + rLoc = 1159; + rType = 1; + }; + 7EEF34F40D0C9B78005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; + name = "GSH_OpenGLMacOSX.cpp: 27"; + rLen = 0; + rLoc = 471; + rType = 0; + vrLen = 541; + vrLoc = 93; + }; + 7EEF34F50D0C9B78005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7EEF338C0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.h */; + name = "GSH_OpenGLMacOSX.h: 1"; + rLen = 1; + rLoc = 0; + rType = 0; + vrLen = 438; + vrLoc = 0; + }; + 7EEF34F60D0C9B78005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; + name = "GSH_OpenGLMacOSX.cpp: 27"; + rLen = 0; + rLoc = 471; + rType = 0; + vrLen = 539; + vrLoc = 93; + }; + 7EEF34F70D0C9B78005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E8988310D08BD090077F9ED /* RangeList16.h */; + name = "RangeList16.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 553; + vrLoc = 0; + }; + 7EEF34F80D0C9B78005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E89882D0D08BD090077F9ED /* Profiler.cpp */; + name = "Profiler.cpp: 14"; + rLen = 0; + rLoc = 172; + rType = 0; + vrLen = 514; + vrLoc = 325; + }; + 7EEF34F90D0C9B78005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E8987070D08B4640077F9ED /* PS2VM.cpp */; + name = "PS2VM.cpp: 778"; + rLen = 0; + rLoc = 17110; + rType = 0; + vrLen = 667; + vrLoc = 16902; + }; + 7EEF34FA0D0C9B78005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E947C3B0D0B4E3800A2AE15 /* GSH_OpenGL.cpp */; + name = "GSH_OpenGL.cpp: 1151"; + rLen = 0; + rLoc = 24331; + rType = 0; + vrLen = 447; + vrLoc = 24148; + }; + 7EEF34FB0D0C9B97005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E947C3B0D0B4E3800A2AE15 /* GSH_OpenGL.cpp */; + name = "GSH_OpenGL.cpp: 1145"; + rLen = 0; + rLoc = 24230; + rType = 0; + vrLen = 447; + vrLoc = 24148; + }; + 7EEF35000D0C9BDA005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E947C3B0D0B4E3800A2AE15 /* GSH_OpenGL.cpp */; + name = "GSH_OpenGL.cpp: 1145"; + rLen = 0; + rLoc = 24230; + rType = 0; + vrLen = 444; + vrLoc = 24148; + }; + 7EEF35010D0C9BDA005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E8987070D08B4640077F9ED /* PS2VM.cpp */; + name = "PS2VM.cpp: 778"; + rLen = 0; + rLoc = 17100; + rType = 0; + vrLen = 631; + vrLoc = 16902; + }; + 7EEF35020D0C9BDA005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; + rLen = 0; + rLoc = 26; + rType = 1; + }; + 7EEF35030D0C9BDA005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E947C3B0D0B4E3800A2AE15 /* GSH_OpenGL.cpp */; + name = "GSH_OpenGL.cpp: 1145"; + rLen = 0; + rLoc = 24230; + rType = 0; + vrLen = 444; + vrLoc = 24148; + }; + 7EEF35040D0C9BDA005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; + name = "GSH_OpenGLMacOSX.cpp: 27"; + rLen = 0; + rLoc = 465; + rType = 0; + vrLen = 539; + vrLoc = 93; + }; + 7EEF35050D0C9BDA005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E8987070D08B4640077F9ED /* PS2VM.cpp */; + name = "PS2VM.cpp: 778"; + rLen = 0; + rLoc = 17100; + rType = 0; + vrLen = 631; + vrLoc = 16902; + }; + 7EEF35060D0C9BDA005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; + name = "GSH_OpenGLMacOSX.cpp: 27"; + rLen = 0; + rLoc = 465; + rType = 0; + vrLen = 539; + vrLoc = 93; + }; + 7EEF35080D0C9BE0005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E8987B20D08BD090077F9ED /* BasicBlock.cpp */; + name = "BasicBlock.cpp: 60"; + rLen = 0; + rLoc = 1311; + rType = 0; + vrLen = 496; + vrLoc = 1373; + }; + 7EEF350A0D0C9BE2005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7EEF338D0D0B8F63005FE2D8 /* GSH_OpenGLMacOSX.cpp */; + name = "GSH_OpenGLMacOSX.cpp: 14"; + rLen = 0; + rLoc = 216; + rType = 0; + vrLen = 539; + vrLoc = 93; + }; + 7EEF350B0D0C9CD5005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E8987BF0D08BD090077F9ED /* Config.cpp */; + name = "Config.cpp: 12"; + rLen = 0; + rLoc = 264; + rType = 0; + vrLen = 530; + vrLoc = 1800; + }; + 7EEF350C0D0C9CD5005FE2D8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7E8987BF0D08BD090077F9ED /* Config.cpp */; + name = "Config.cpp: 12"; + rLen = 0; + rLoc = 264; + rType = 0; + vrLen = 530; + vrLoc = 1800; + }; 8D1107260486CEB800E47090 /* Purei */ = { activeExec = 0; executables = ( diff --git a/Purei.xcodeproj/project.pbxproj b/Purei.xcodeproj/project.pbxproj index 175dad1f..d988164f 100644 --- a/Purei.xcodeproj/project.pbxproj +++ b/Purei.xcodeproj/project.pbxproj @@ -736,8 +736,8 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Purei_Prefix.pch; - INFOPLIST_FILE = Info.plist; + GCC_PREFIX_HEADER = Source/macosxui/Purei_Prefix.pch; + INFOPLIST_FILE = Source/macosxui/Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -775,6 +775,11 @@ ); GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + "~/Libraries/boost_1_34_1/boost/tr1/tr1", + "~/Libraries/boost_1_34_1/", + "~/Projects/Framework/include", + ); PREBINDING = NO; SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; diff --git a/Source/BasicBlock.cpp b/Source/BasicBlock.cpp index fd755493..7814cf42 100644 --- a/Source/BasicBlock.cpp +++ b/Source/BasicBlock.cpp @@ -1,106 +1,106 @@ -#include "BasicBlock.h" -#include "MipsCodeGen.h" -#include "MemStream.h" -#include "offsetof_def.h" - -using namespace Framework; - -CBasicBlock::CBasicBlock(CMIPS& context, uint32 begin, uint32 end) : -m_begin(begin), -m_end(end), -m_context(context), -m_text(NULL) -{ - assert(m_end >= m_begin); -} - -CBasicBlock::~CBasicBlock() -{ - if(m_text != NULL) - { - delete [] m_text; - } -} - -void CBasicBlock::Compile() -{ - CMemStream stream; - CMipsCodeGen codeGen; - - for(unsigned int i = 0; i < 4; i++) - { - codeGen.SetVariableAsConstant( - offsetof(CMIPS, m_State.nGPR[CMIPS::R0].nV[i]), - 0 - ); - } - codeGen.SetStream(&stream); - codeGen.Begin(NULL); - for(uint32 address = m_begin; address <= m_end; address += 4) - { - m_context.m_pArch->CompileInstruction( - address, - reinterpret_cast(&codeGen), - &m_context, - true); - //Sanity check - assert(codeGen.IsStackEmpty()); - } - codeGen.DumpVariables(0); - codeGen.m_Assembler.Ret(); - codeGen.End(); - - //Save text - m_text = new uint8[stream.GetSize()]; - memcpy(m_text, stream.GetBuffer(), stream.GetSize()); -} - -unsigned int CBasicBlock::Execute() -{ - void* function = m_text; - CMIPS* context = &m_context; - - __asm - { - push ebp - push ebx - push esi - push edi - - mov eax, [function] - mov ebp, [context] - call eax - - pop edi - pop esi - pop ebx - pop ebp - } - - if(m_context.m_State.nDelayedJumpAddr != MIPS_INVALID_PC) - { - m_context.m_State.nPC = m_context.m_State.nDelayedJumpAddr; - m_context.m_State.nDelayedJumpAddr = MIPS_INVALID_PC; - } - else - { - m_context.m_State.nPC = m_end + 4; - } - - return ((m_end - m_begin) / 4) + 1; -} - -uint32 CBasicBlock::GetBeginAddress() const -{ - return m_begin; -} - -uint32 CBasicBlock::GetEndAddress() const -{ - return m_end; -} - -bool CBasicBlock::IsCompiled() const -{ - return m_text != NULL; -} +#include "BasicBlock.h" +#include "MipsCodeGen.h" +#include "MemStream.h" +#include "offsetof_def.h" + +using namespace Framework; + +CBasicBlock::CBasicBlock(CMIPS& context, uint32 begin, uint32 end) : +m_begin(begin), +m_end(end), +m_context(context), +m_text(NULL) +{ + assert(m_end >= m_begin); +} + +CBasicBlock::~CBasicBlock() +{ + if(m_text != NULL) + { + delete [] m_text; + } +} + +void CBasicBlock::Compile() +{ + CMemStream stream; + CMipsCodeGen codeGen; + + for(unsigned int i = 0; i < 4; i++) + { + codeGen.SetVariableAsConstant( + offsetof(CMIPS, m_State.nGPR[CMIPS::R0].nV[i]), + 0 + ); + } + codeGen.SetStream(&stream); + codeGen.Begin(NULL); + for(uint32 address = m_begin; address <= m_end; address += 4) + { + m_context.m_pArch->CompileInstruction( + address, + reinterpret_cast(&codeGen), + &m_context, + true); + //Sanity check + assert(codeGen.IsStackEmpty()); + } + codeGen.DumpVariables(0); + codeGen.m_Assembler.Ret(); + codeGen.End(); + + //Save text + m_text = new uint8[stream.GetSize()]; + memcpy(m_text, stream.GetBuffer(), stream.GetSize()); +} + +unsigned int CBasicBlock::Execute() +{ + void* function = m_text; + CMIPS* context = &m_context; + + __asm + { + push ebp + push ebx + push esi + push edi + + mov eax, [function] + mov ebp, [context] + call eax + + pop edi + pop esi + pop ebx + pop ebp + } + + if(m_context.m_State.nDelayedJumpAddr != MIPS_INVALID_PC) + { + m_context.m_State.nPC = m_context.m_State.nDelayedJumpAddr; + m_context.m_State.nDelayedJumpAddr = MIPS_INVALID_PC; + } + else + { + m_context.m_State.nPC = m_end + 4; + } + + return ((m_end - m_begin) / 4) + 1; +} + +uint32 CBasicBlock::GetBeginAddress() const +{ + return m_begin; +} + +uint32 CBasicBlock::GetEndAddress() const +{ + return m_end; +} + +bool CBasicBlock::IsCompiled() const +{ + return m_text != NULL; +} diff --git a/Source/macosxui/English.lproj/MainMenu.nib/designable.nib b/Source/macosxui/English.lproj/MainMenu.nib/designable.nib index 4c733a49..88fabce7 100644 --- a/Source/macosxui/English.lproj/MainMenu.nib/designable.nib +++ b/Source/macosxui/English.lproj/MainMenu.nib/designable.nib @@ -8,8 +8,8 @@ 343.00 YES - + YES @@ -37,12 +37,12 @@ 1048576 2147483647 - - NSImage + + NSImage NSMenuCheckmark - - + + NSMenuMixedState submenuAction: @@ -55,8 +55,8 @@ QWJvdXQg44OX44Os44Kk77yBA 2147483647 - - + + @@ -66,8 +66,8 @@ 1048576 2147483647 - - + + @@ -75,8 +75,8 @@ , 1048576 2147483647 - - + + @@ -86,8 +86,8 @@ 1048576 2147483647 - - + + @@ -95,8 +95,8 @@ 1048576 2147483647 - - + + submenuAction: @@ -114,8 +114,8 @@ 1048576 2147483647 - - + + @@ -123,8 +123,8 @@ h 1048576 2147483647 - - + + @@ -132,8 +132,8 @@ 1572864 2147483647 - - + + @@ -141,8 +141,8 @@ 1048576 2147483647 - - + + @@ -152,8 +152,8 @@ 1048576 2147483647 - - + + @@ -161,8 +161,8 @@ q 1048576 2147483647 - - + + _NSAppleMenu @@ -174,8 +174,8 @@ 1048576 2147483647 - - + + submenuAction: @@ -187,8 +187,8 @@ 1048576 2147483647 - - + + @@ -196,8 +196,8 @@ o 1048576 2147483647 - - + + @@ -208,8 +208,8 @@ 1048576 2147483647 - - + + submenuAction: @@ -221,8 +221,8 @@ r 1048576 2147483647 - - + + @@ -230,8 +230,8 @@ 1048576 2147483647 - - + + @@ -239,8 +239,8 @@ 1048576 2147483647 - - + + @@ -250,8 +250,8 @@ 1048576 2147483647 - - + + @@ -259,8 +259,8 @@ 1048576 2147483647 - - + + @@ -268,8 +268,8 @@ s 1048576 2147483647 - - + + @@ -277,8 +277,8 @@ l 1048576 2147483647 - - + + @@ -289,8 +289,8 @@ 1048576 2147483647 - - + + submenuAction: @@ -302,8 +302,8 @@ m 1048576 2147483647 - - + + @@ -311,8 +311,8 @@ 1048576 2147483647 - - + + @@ -322,8 +322,8 @@ 1048576 2147483647 - - + + @@ -331,8 +331,8 @@ 1048576 2147483647 - - + + _NSWindowsMenu @@ -344,8 +344,8 @@ 1048576 2147483647 - - + + submenuAction: @@ -357,8 +357,8 @@ ? 1048576 2147483647 - - + + @@ -388,7 +388,7 @@ - AAAAAA + AAAABQAAAAwAAAAgAAAAAA @@ -496,7 +496,7 @@ - m_openGlView + m_openGlView @@ -958,9 +958,9 @@ {74, 862} {{164, 241}, {442, 20}} - {{510, 133}, {480, 360}} + {{226, 121}, {480, 360}} - {{510, 133}, {480, 360}} + {{226, 121}, {480, 360}} @@ -1026,7 +1026,7 @@ id - + m_openGlView NSOpenGLView @@ -1042,11 +1042,11 @@ YnBsaXN0MDDUAAEAAgADAAQABQAGAAkAClgkdmVyc2lvblQkdG9wWSRhcmNoaXZlclgkb2JqZWN0cxIA AYag0QAHAAhdSUIub2JqZWN0ZGF0YYABXxAPTlNLZXllZEFyY2hpdmVyrxEBDAALAAwAMQA1ADYAPAA9 -AEIAVgBXAFgAWQALAGYAagB2AHgAewB8AIAAhACIAIsAkACUAAsAlQCXAJgAmwCfAK4AtADEAMsAzADN -ANIA0wDUANcA2wDcAN8A4ADkAOoA7QDwAPEA8gD1APkBAAEBAQIBAwEHAQ4BEwEUARUBGQEgASEBIgEm -AS0BLgEvATABNQE2AToBQQFFAUYBRwFIAUwBUwFUAVUBVgFbAWIBYwFkAWkBcAF0AXUBdgF3AXsBgwGE -AYUBsgG9AcgBzQHOAc8B0wHdAeQB5QHmAe0B7gH1AfYB/wIGAgcCDgIPAhACFwIYAhkCGwIkAc4CJQIp -AjICOwHOAjwCSgJTAloCWwJcAmUBzgJmAmsCbgJvAngCeQJ6AoICiwHOAowCkQKYApkCogHOAqMCqgKz +AEIAVgBXAFgAWQALAGYAagB2AHgAewB8AIAAhACIAIsAkACUAAsAlQCXAJgAmwCfAK4AtgC5ALoAuwC/ +AMMA0wDaANsA3ADhAOIA4wDmAOoA6wDuAO8A8gD2AP4BAgEDAQQBBQEJARABFQEWARcBGAEcASMBJAEl +ASoBMQEyATMBNwE+AT8BQAFFAUwBUAFRAVIBUwFYAVsBXAFgAWcBaAFpAWoBbgF1AXYBdwF7AYIBgwGE +AYUBsgG5AboBuwHGAccByAHNAdAB0QHTAdQB2QHgAeEB4gHwAfsCBAINAhYCFwIeAiICIwIsAi0CMQI6 +AccCPwJIAccCSQJTAloCWwJcAmMCZAJrAmwCcwJ0AnUCfAJ9An4ChwHHApACmQHHApoCoQKiAccCqwKs ArQCtQK3AuQDEgNAA0EDQgNDA0QDRQNGA0cDSANJA0oDSwNMA00DTgNPA1ADUQNSA1MDVANVA1YDVwNY A1kDWgNbA1wDXQNeA18DYANhA2IDYwNkA2UDZgNnA2gDaQNqA2sDbgNxA6sD5QPmA+cD6APpA+oD6wPs A+0D7gPvA/AD8QPyA/MD9AP1A/YD9wP4A/kD+gP7A/wD/QP+A/8EAAQBBAIEAwQEBAUEBgQHBAgECQQK @@ -1069,142 +1069,142 @@ ZGVyWk5TU3Vidmlld3NYTlN2RmxhZ3NbTlNGcmFtZVNpemVbTlNTdXBlcnZpZXeADIAagA0RAQCAGIAM gBnSAA4APgBnAGiAF6EAaYAO2ABaAA4AawBsAFwAWABeAG0ATABvAHAAcQByAF8ATAB1V05TRnJhbWVd TlNQaXhlbEZvcm1hdFxOU0RyYXdNYXRyaXiAC4AWgBGAEhEFEoAMgAuAD9EADgB3gBDSADcAOAB5AHqi AHoAO1pOU1BTTWF0cml4XxAVe3stNSwgMH0sIHs0ODUsIDM2MH190gAOAH0AfgB/XxARTlNQaXhlbEF0 -dHJpYnV0ZXOAFYAT0gAOAIEAggCDV05TLmRhdGGAFEQAAAAA0gA3ADgAhQCGowCGAIcAO11OU011dGFi -bGVEYXRhVk5TRGF0YdIANwA4AIkAiqIAigA7XxATTlNPcGVuR0xQaXhlbEZvcm1hdNIANwA4AIwAjaQA -jQCOAI8AO1xOU09wZW5HTFZpZXdWTlNWaWV3W05TUmVzcG9uZGVy0gA3ADgAkQCSowCSAJMAO15OU011 -dGFibGVBcnJheVdOU0FycmF5Wns0ODAsIDM2MH3SADcAOACWAI6jAI4AjwA7XxAVe3swLCAwfSwgezEy -ODAsIDc3OH190gA3ADgAmQCaogCaADtfEBBOU1dpbmRvd1RlbXBsYXRl0gA3ADgAnACdowCdAJ4AO1xO -U011dGFibGVTZXRVTlNTZXTSAA4APgBnAKGAF6wAogCjAKQApQCmAKcAqACpAKoAqwCsAK2AH4AtgDOA -OIA9gEGARoBIgE6AU4BXgF3TAA4ArwCwALEAsgCzWE5TU291cmNlV05TTGFiZWyALIAggCvYAA4AtQC2 -ALcAuAC5ALoAuwC8AL0AvgC/AMAAwQDCAMNXTlNUaXRsZV8QEU5TS2V5RXF1aXZNb2RNYXNrWk5TS2V5 -RXF1aXZdTlNNbmVtb25pY0xvY1lOU09uSW1hZ2VcTlNNaXhlZEltYWdlVk5TTWVudYAqgCISABAAAIAj -En////+AJIAogCHUAA4AtQDFAMYAxwDIAMkAylZOU05hbWVbTlNNZW51SXRlbXOAeYCAgI6AgmkASABp -AGQAZQAgMNcw7DCk/wFRaNMADgAyAM4AzwDQANFeTlNSZXNvdXJjZU5hbWWAJ4AlgCZXTlNJbWFnZV8Q -D05TTWVudUNoZWNrbWFya9IANwA4ANUA1qIA1gA7XxAQTlNDdXN0b21SZXNvdXJjZdMADgAyAM4AzwDQ -ANqAJ4AlgClfEBBOU01lbnVNaXhlZFN0YXRl0gA3ADgA3QDeogDeADtaTlNNZW51SXRlbVVoaWRlOtIA -NwA4AOEA4qMA4gDjADtfEBVOU05pYkNvbnRyb2xDb25uZWN0b3JeTlNOaWJDb25uZWN0b3LUAA4A5QCv -ALAA5gDnAOgA6V1OU0Rlc3RpbmF0aW9ugDKAL4AugDHSAA4AMgAzADSABIAD0gAOADIAMwDvgASAMF8Q -FENBcHBsaWNhdGlvbkRlbGVnYXRlWGRlbGVnYXRl0gA3ADgA8wD0owD0AOMAO18QFE5TTmliT3V0bGV0 -Q29ubmVjdG9y0wAOAK8AsACxAPcA+IAsgDSAN9gADgC1ALYAtwC4ALkAugC7ALwA+wC+APwAwADBAMIA -w4AqgDWANoAkgCiAIVhTaG93IEFsbFBfEBZ1bmhpZGVBbGxBcHBsaWNhdGlvbnM60wAOAK8AsACxAQUB -BoAsgDmAPNgADgC1ALYAtwC4ALkAugC7ALwBCQC+APwAwADBAMIBDYAqgDuANoAkgCiAOtQADgC1AMUA -xgDHARABEQESgHmAmICcgJpfEBJCcmluZyBBbGwgdG8gRnJvbnRfEA9hcnJhbmdlSW5Gcm9udDrTAA4A -rwCwALEBFwEYgCyAPoBA2AAOALUAtgC3ALgAuQC6ALsAvAEbAL4A/ADAAMEAwgENgCqAP4A2gCSAKIA6 -VFpvb21ccGVyZm9ybVpvb2060wAOAK8AsACxASQBJYAsgEKARdgADgC1ALYAtwC4ALkAugC7ALwBKAC+ -ASkAwADBAMIBDYAqgEOARIAkgCiAOlhNaW5pbWl6ZVFtXxATcGVyZm9ybU1pbmlhdHVyaXplOtQADgDl -AK8AsADmAGkA5wE0gDKADoAvgEdcbV9vcGVuR2xWaWV30wAOAK8AsACxATgBOYAsgEmATdgADgC1ALYA -twC4ALkAugC7ALwBPAC+AT0AwADBAMIBQIAqgEuATIAkgCiAStMADgC1AMYAxwFDAUSAeYB7gH1fEBNO -ZXdBcHBsaWNhdGlvbiBIZWxwUT9Zc2hvd0hlbHA60wAOAK8AsACxAUoBS4AsgE+AUtgADgC1ALYAtwC4 -ALkAugC7ALwBTgC+AU8AwADBAMIAw4AqgFCAUYAkgCiAIWkAUQB1AGkAdAAgMNcw7DCk/wFRcVp0ZXJt -aW5hdGU61AAOAOUArwCwALEAHwFZAVqALIACgFSAVtcADgC1ALcAuAC5ALoAuwC8AV0A/ADAAMEAwgDD -gCqAVYA2gCSAKIAhagBBAGIAbwB1AHQAIDDXMOwwpP8BXxAdb3JkZXJGcm9udFN0YW5kYXJkQWJvdXRQ -YW5lbDrUAA4A5QCvALAAsQDnAWcBaIAsgC+AWIBc2AAOALUAtgC3ALgAuQC6ALsAvAFrAL4BbADAAMEA -wgFvgCqAWoBbgCSAKIBZ0wAOALUAxgDHAXIBc4B5gJKAlFxMb2FkIC5FTEYuLi5Rb1hCb290RWxmOtMA -DgCvALAAsQF5AXqALIBegGDYAA4AtQC2ALcAuAC5ALoAuwC8AX0BfgC/AMAAwQDCAMOAKoBfEgAYAACA -I4AkgCiAIVtIaWRlIE90aGVyc18QFmhpZGVPdGhlckFwcGxpY2F0aW9uczrSAA4APgGGAYeAnq8QKgBp -AYkBigGLAYwBWQGOAY8A5wGRAZIBkwGUAQUBlgENASQAwwFKAWcAQQGdAZ4BQAFvAaEBogGjAOgA9wF5 -AacBqABMALIBqwGsATgBrgGvAbABF4AOgGKAY4BpgHqAVIBugH6AL4B/gGSAjYCKgDmAm4A6gEKAIYBP -gFiAB4CEgJeASoBZgGyAcYBngC6ANIBegHCAdoALgCCAkYBzgEmAlYCHgIOAPtoADgC1ALYBswC3AbQA -uAC5ALoAuwC8APwAvgG3APwBtwDAAMEAwgDDXU5TSXNTZXBhcmF0b3JcTlNJc0Rpc2FibGVkgCqANgmA -NgmAJIAogCHaAA4BvgC1ALYAtwC4ALkAugC7Ab8AvAGjAcIAvgD8AMAAwQDCAZIBx1lOU1N1Ym1lbnVY -TlNBY3Rpb26AKoBngGWANoAkgCiAZIBm1AAOALUAxQDGAMcBygHLAcyAeYCPgJ2AkF8QD1ZpcnR1YWwg -TWFjaGluZV5zdWJtZW51QWN0aW9uOtMADgC1AMYAxwHCAdKAeYBlgGjSAA4APgBnAdWAF6cBiwGhAY4B -pwGiAawBqIBpgGyAboBwgHGAc4B22AAOALUAtgC3ALgAuQC6ALsAvAHfAL4B4ADAAMEAwgGjgCqAaoBr -gCSAKIBnXlBhdXNlIC8gUmVzdW1lUXLYAA4AtQC2ALcAuAC5ALoAuwC8AegAvgD8AMAAwQDCAaOAKoBt -gDaAJIAogGdVUmVzZXTYAA4AtQC2ALcAuAC5ALoAuwC8AfAAvgD8AMAAwQDCAaOAKoBvgDaAJIAogGdf -EBVQYXVzZSBXaGVuIEZvY3VzIExvc3TaAA4AtQC2AbMAtwG0ALgAuQC6ALsAvAD8AL4BtwD8AbcAwADB -AMIBo4AqgDYJgDYJgCSAKIBn2AAOALUAtgC3ALgAuQC6ALsAvAIBAL4A/ADAAMEAwgGjgCqAcoA2gCSA -KIBnWlN0YXRlIFNsb3TYAA4AtQC2ALcAuAC5ALoAuwC8AgkAvgIKAMAAwQDCAaOAKoB0gHWAJIAogGda -U2F2ZSBTdGF0ZVFz2AAOALUAtgC3ALgAuQC6ALsAvAISAL4CEwDAAMEAwgGjgCqAd4B4gCSAKIBnWkxv -YWQgU3RhdGVRbNIANwA4AhoAu6IAuwA72gAOAb4AtQC2ALcAuAC5ALoAuwG/ALwBQAFDAL4A/ADAAMEA -wgGSAiOAKoBKgHuANoAkgCiAZIB8VEhlbHDSAA4APgBnAieAF6EBOIBJ2gAOALUAtgGzALcBtAC4ALkA -ugC7ALwA/AC+AbcA/AG3AMAAwQDCAMOAKoA2CYA2CYAkgCiAIdoADgG+ALUAtgC3ALgAuQC6ALsBvwC8 -AMMAyAC+APwAwADBAMIBkgI6gCqAIYCAgDaAJIAogGSAgV5OZXdBcHBsaWNhdGlvbtIADgA+AGcCPoAX -qwFZAbABnQGJAa8BjwCyAXkA9wGTAUqAVICDgISAYoCHgH6AIIBegDSAjYBP2gAOALUAtgGzALcBtAC4 -ALkAugC7ALwA/AC+AbcA/AG3AMAAwQDCAMOAKoA2CYA2CYAkgCiAIdgADgC1ALYAtwC4ALkAugC7ALwC -VQC+AlYAwADBAMIAw4AqgIWAhoAkgCiAIWwAUAByAGUAZgBlAHIAZQBuAGMAZQBzICZRLNoADgG+ALUA -tgC3ALgAuQC6ALsBvwC8AZQCXwC+APwAwADBAMIAwwJkgCqAioCIgDaAJIAogCGAiVhTZXJ2aWNlc9QA -DgC1AMUAxgDHAl8CaQJqgHmAiICMgIvSAA4APgBnAm2AF6BfEA9fTlNTZXJ2aWNlc01lbnXaAA4AtQC2 -AbMAtwG0ALgAuQC6ALsAvAD8AL4BtwD8AbcAwADBAMIAw4AqgDYJgDYJgCSAKIAhXF9OU0FwcGxlTWVu -dVlBTWFpbk1lbnXSAA4APgBnAnyAF6UBkQGrAYoBngGMgH+AkYBjgJeAetoADgG+ALUAtgC3ALgAuQC6 -ALsBvwC8AW8BcgC+APwAwADBAMIBkgKKgCqAWYCSgDaAJIAogGSAk1RGaWxl0gAOAD4AZwKOgBeiAa4B -Z4CVgFjYAA4AtQC2ALcAuAC5ALoAuwC8ApMAvgD8AMAAwQDCAW+AKoCWgDaAJIAogFlbQm9vdCBjZHJv -bTDaAA4BvgC1ALYAtwC4ALkAugC7Ab8AvAENARAAvgD8AMAAwQDCAZICoYAqgDqAmIA2gCSAKIBkgJlW -V2luZG930gAOAD4AZwKlgBekASQBFwGWAQWAQoA+gJuAOdoADgC1ALYBswC3AbQAuAC5ALoAuwC8APwA -vgG3APwBtwDAAMEAwgENgCqANgmANgmAJIAogDpeX05TV2luZG93c01lbnVbX05TTWFpbk1lbnXSADcA -OAK2AJOiAJMAO9IADgA+AYYCuYCerxAqAEwAwwGSAaMBkgDDAaMAwwAfAZIAHwDDAa8BDQENAZ4BDQGR -AMMBbwAfAMMBkgGMAasBowGjAYoAHwDDAMMBowGjAEEAwwGSAaMBQAFvAMMAwwENgAuAIYBkgGeAZIAh -gGeAIYACgGSAAoAhgIeAOoA6gJeAOoB/gCGAWYACgCGAZIB6gJGAZ4BngGOAAoAhgCGAZ4BngAeAIYBk -gGeASoBZgCGAIYA60gAOAD4BhgLmgJ6vECsAaQGKAYkBiwGMAVkBjgDnAY8BkQGSAZMBBQGUAMMBDQBB -AUoBlgEkAWcBQAGeAW8BoQGiAagBowDoAacAHwBMAZ0A9wF5AasAsgGsATgBrgGvAbABF4AOgGOAYoBp -gHqAVIBugC+AfoB/gGSAjYA5gIqAIYA6gAeAT4CbgEKAWIBKgJeAWYBsgHGAdoBngC6AcIACgAuAhIA0 -gF6AkYAggHOASYCVgIeAg4A+0gAOAD4BhgMUgJ6vECsDFQMWAxcDGAMZAxoDGwMcAx0DHgMfAyADIQMi -AyMDJAMlAyYDJwMoAykDKgMrAywDLQMuAy8DMAMxAzIDMwM0AzUDNgM3AzgDOQM6AzsDPAM9Az4DP4Ci -gKOApIClgKaAp4CogKmAqoCrgKyArYCugK+AsICxgLKAs4C0gLWAtoC3gLiAuYC6gLuAvIC9gL6Av4DA -gMGAwoDDgMSAxYDGgMeAyIDJgMqAy4DMW09wZW5HTCBWaWV3XxAbTWVudSBJdGVtIChWaXJ0dWFsIE1h -Y2hpbmUpW1NlcGFyYXRvci0xXxAaTWVudSBJdGVtIChQYXVzZSAvIFJlc3VtZSlRMW8QFgBNAGUAbgB1 -ACAASQB0AGUAbQAgACgAQQBiAG8AdQB0ACAw1zDsMKT/AQApXxAhTWVudSBJdGVtIChQYXVzZSBXaGVu -IEZvY3VzIExvc3QpXxAUQXBwbGljYXRpb24gRGVsZWdhdGVbU2VwYXJhdG9yLTJfEBpNZW51IEl0ZW0g -KE5ld0FwcGxpY2F0aW9uKVhNYWluTWVudVtTZXBhcmF0b3ItM18QHk1lbnUgSXRlbSAoQnJpbmcgQWxs -IHRvIEZyb250KV8QD01lbnUgKFNlcnZpY2VzKV8QFU1lbnUgKE5ld0FwcGxpY2F0aW9uKV1NZW51IChX -aW5kb3cpbxAdAFcAaQBuAGQAbwB3ACAAKDDXMOwwpP8BACAALQAgAE8AdQB0AHAAdQB0ACAAVwBpAG4A -ZABvAHcAKVQxMTExW1NlcGFyYXRvci01XxAUTWVudSBJdGVtIChNaW5pbWl6ZSlfEBhNZW51IEl0ZW0g -KExvYWQgLkVMRi4uLilRMl8QEk1lbnUgSXRlbSAoV2luZG93KVtNZW51IChGaWxlKV8QEU1lbnUgSXRl -bSAoUmVzZXQpXxAWTWVudSBJdGVtIChTdGF0ZSBTbG90KV8QFk1lbnUgSXRlbSAoTG9hZCBTdGF0ZSlf -EBZNZW51IChWaXJ0dWFsIE1hY2hpbmUpW0FwcGxpY2F0aW9uWVNlcGFyYXRvclxGaWxlJ3MgT3duZXJc -Q29udGVudCBWaWV3UzEyMV8QFE1lbnUgSXRlbSAoU2hvdyBBbGwpXxAXTWVudSBJdGVtIChIaWRlIE90 -aGVycylfEBBNZW51IEl0ZW0gKEZpbGUpbxAVAE0AZQBuAHUAIABJAHQAZQBtACAAKABIAGkAZABlACAw -1zDsMKT/AQApXxAWTWVudSBJdGVtIChTYXZlIFN0YXRlKV8QH01lbnUgSXRlbSAoTmV3QXBwbGljYXRp -b24gSGVscClfEBdNZW51IEl0ZW0gKEJvb3QgY2Ryb20wKV8QFE1lbnUgSXRlbSAoU2VydmljZXMpW1Nl -cGFyYXRvci00XxAQTWVudSBJdGVtIChab29tKdIADgA+AYYDbYCeoNIADgA+AYYDcICeoNIADgA+AYYD -c4CerxA3AGkAqwGJAYoBiwCqAVkBjgCjAKwBkgEFAZQApgENASQBSgGdAZ4ApAGoAaMAqAAfAEwAsgGr -AawBOAGuAKIBrwEXAYwBjwDnAZEBkwCnAZYAwwFnAEEBQAGhAW8BogClAOgA9wF5AacAqQCtAbCADoBT -gGKAY4BpgE6AVIBugC2AV4BkgDmAioA9gDqAQoBPgISAl4AzgHaAZ4BGgAKAC4AggJGAc4BJgJWAH4CH -gD6AeoB+gC+Af4CNgEGAm4AhgFiAB4BKgGyAWYBxgDiALoA0gF6AcIBIgF2Ag9IADgA+AYYDrYCerxA3 -A64DrwOwA7EDsgOzA7QDtQO2A7cDuAO5A7oDuwO8A70DvgO/A8ADwQPCA8MDxAPFA8YDxwPIA8kDygPL -A8wDzQPOA88D0APRA9ID0wPUA9UD1gPXA9gD2QPaA9sD3APdA94D3wPgA+ED4gPjA+SA0YDSgNOA1IDV -gNaA14DYgNmA2oDbgNyA3YDegN+A4IDhgOKA44DkgOWA5oDngOiA6YDqgOuA7IDtgO6A74DwgPGA8oDz -gPSA9YD2gPeA+ID5gPqA+4D8gP2A/oD/gQEAgQEBgQECgQEDgQEEgQEFgQEGgQEHEQF3EI4QjxEBfxEB -gREBcRA6EQGDEQGLEQGMEB0QBRCCEPAQGBAXEIgQgRATEQFyEQGHEQGAEQGNEQGOEQF0EIYQUxEBhhBv -EQF8EQFvEIMQ7xBnEJARAYoQOBCVECUQXBA5EQF9EQFzEGoRAYIRAXsRAYUQJxP//////////RCWEJER -AYQRAWgRAXAQ7NIADgA+AGcEHoAXoNIADgA+AYYEIYCeoNIADgA+AYYEJICeoNIANwA4BCYEJ6IEJwA7 -Xk5TSUJPYmplY3REYXRhAAgAGQAiACcAMQA6AD8ARABSAFQAZgKCAogC0wLaAuEC7wMBAx0DKwM3A0MD -UQNcA2oDhgOUA6cDuQPTA90D6gPsA+8D8QPzA/YD+AP6A/wD/gQABAIEBQQHBAkECwQOBBEEEwQcBCgE -KgQsBDoEQwRMBFcEXARrBHQEhwSQBJsEnQSgBKIEywTYBOUE8wT9BQsFGAUqBT4FSgVMBU4FUAVSBVcF -WQVbBV0FXwVhBXwFpwWwBc0F3wXqBfMF/wYLBg0GDwYRBhQGFgYYBhoGIwYlBigGKgZLBlMGYQZuBnAG -cgZ0BnYGeQZ7Bn0GfwaEBoYGjwaUBp8GtwbABtQG1gbYBuEG6QbrBvAG+QcABw4HFQceByMHOQdCB0sH -WAdfB2sHdAd7B4oHkgedB6YHrQfFB84H0wfmB+8H9ggDCAkIEggUCC0ILwgxCDMINQg3CDkIOwg9CD8I -QQhDCEUIUghbCGMIZQhnCGkIigiSCKYIsQi/CMkI1gjdCN8I4QjmCOgI7QjvCPEI8wkECQsJFwkZCRsJ -HQkfCTIJNAlBCVAJUglUCVYJXglwCXkJfgmRCZ4JoAmiCaQJtwnACcUJ0AnWCd8J5gn+Cg0KHgosCi4K -MAoyCjQKPQo/CkEKSgpMCk4KZQpuCncKfgqVCqIKpAqmCqgKyQrLCs0KzwrRCtMK1QreCt8K+AsFCwcL -CQsLCywLLgswCzILNAs2CzgLSQtLC00LTwtRC2YLeAuFC4cLiQuLC6wLrguwC7ILtAu2C7gLvQvKC9cL -2QvbC90L/gwADAIMBAwGDAgMCgwTDBUMKww8DD4MQAxCDEQMUQxeDGAMYgxkDIUMhwyJDIsMjQyPDJEM -ngygDKIMpAy6DLwMxgzTDNUM1wzZDPoM/Az+DQANAg0EDQYNGQ0bDSYNNw05DTsNPQ0/DVwNXg1gDWIN -ZA1mDWgNfQ2dDa4NsA2yDbQNtg3XDdkN2w3dDd8N4Q3jDfAN8g30DfYOAw4FDg4OGw4dDh8OIQ5CDkQO -Rg5LDk0OTw5RDlMOXw54DoEOgw7aDtwO3g7gDuIO5A7mDugO6g7sDu4O8A7yDvQO9g74DvoO/A7+DwAP -Ag8EDwYPCA8KDwwPDg8QDxIPFA8WDxgPGg8cDx4PIA8iDyQPJg8oDyoPLA8uD1cPZQ9yD3QPdg93D3kP -eg98D34PgA+pD7MPvA++D8APwg/ED8YPyA/KD8wP3Q/fD+EP4w/lD/cQBhATEBUQFxAZECIQJBAzEDUQ -NxA5EDsQPRA/EEEQYhBkEGYQaBBqEGwQbhB9EH8QoBCiEKQQphCoEKoQrBCyENMQ1RDXENkQ2xDdEN8Q -9xEgESIRJBElEScRKBEqESwRLhFPEVERUxFVEVcRWRFbEWYRhxGJEYsRjRGPEZERkxGeEaARwRHDEcUR -xxHJEcsRzRHYEdoR4xHoEhESExIVEhcSGRIbEh0SHxIhEiYSLxIxEjQSNhJfEmESYxJkEmYSZxJpEmsS -bRKWEpgSmhKcEp4SoBKiEqQSphK1Er4SwBLXEtkS2xLdEt8S4RLjEuUS5xLpEusS7RMWExgTGhMbEx0T -HhMgEyITJBNFE0cTSRNLE00TTxNRE2oTbBOVE5cTmRObE50TnxOhE6MTpROuE78TwRPDE8UTxxPQE9IT -0xPlFA4UEBQSFBMUFRQWFBgUGhQcFCkUMxQ8FD4USRRLFE0UTxRRFFMUfBR+FIAUghSEFIYUiBSKFIwU -kRSaFJwUoRSjFKUUxhTIFMoUzBTOFNAU0hTeFQcVCRULFQ0VDxURFRMVFRUXFR4VJxUpFTIVNBU2FTgV -OhVjFWUVZxVoFWoVaxVtFW8VcRWAFYwVlRWaFaMVpRX8Ff4WABYCFgQWBhYIFgoWDBYOFhAWEhYUFhYW -GBYaFhwWHhYgFiIWJBYmFigWKhYsFi4WMBYyFjQWNhY4FjoWPBY+FkAWQhZEFkYWSBZKFkwWThZQFlkW -Wxa0FrYWuBa6FrwWvhbAFsIWxBbGFsgWyhbMFs4W0BbSFtQW1hbYFtoW3BbeFuAW4hbkFuYW6BbqFuwW -7hbwFvIW9Bb2FvgW+hb8Fv4XABcCFwQXBhcIFwoXExcVF24XcBdyF3QXdhd4F3oXfBd+F4AXgheEF4YX +dHJpYnV0ZXOAFYAT0gAOAIEAggCDV05TLmRhdGGAFE8QEAAAAAUAAAAMAAAAIAAAAADSADcAOACFAIaj +AIYAhwA7XU5TTXV0YWJsZURhdGFWTlNEYXRh0gA3ADgAiQCKogCKADtfEBNOU09wZW5HTFBpeGVsRm9y +bWF00gA3ADgAjACNpACNAI4AjwA7XE5TT3BlbkdMVmlld1ZOU1ZpZXdbTlNSZXNwb25kZXLSADcAOACR +AJKjAJIAkwA7Xk5TTXV0YWJsZUFycmF5V05TQXJyYXlaezQ4MCwgMzYwfdIANwA4AJYAjqMAjgCPADtf +EBV7ezAsIDB9LCB7MTI4MCwgNzc4fX3SADcAOACZAJqiAJoAO18QEE5TV2luZG93VGVtcGxhdGXSADcA +OACcAJ2jAJ0AngA7XE5TTXV0YWJsZVNldFVOU1NldNIADgA+AGcAoYAXrACiAKMApAClAKYApwCoAKkA +qgCrAKwArYAfgCSAMoA4gD6AQoBGgEqAUIBTgFiAXNQADgCvALAAsQCyAGkAtAC1XU5TRGVzdGluYXRp +b25YTlNTb3VyY2VXTlNMYWJlbIAjgA6AIIAi0gAOADIAMwC4gASAIV8QFENBcHBsaWNhdGlvbkRlbGVn +YXRlXG1fb3BlbkdsVmlld9IANwA4ALwAvaMAvQC+ADtfEBROU05pYk91dGxldENvbm5lY3Rvcl5OU05p +YkNvbm5lY3RvctMADgCwALEAwADBAMKAMYAlgDDYAA4AxADFAMYAxwDIAMkAygDLAMwAzQDOAM8A0ADR +ANJXTlNUaXRsZV8QEU5TS2V5RXF1aXZNb2RNYXNrWk5TS2V5RXF1aXZdTlNNbmVtb25pY0xvY1lOU09u +SW1hZ2VcTlNNaXhlZEltYWdlVk5TTWVudYAvgCcSABgAAIAoEn////+AKYAtgCbUAA4AxADUANUA1gDX +ANgA2VZOU05hbWVbTlNNZW51SXRlbXOAa4BwgHaAcVtIaWRlIE90aGVyc1Fo0wAOADIA3QDeAN8A4F5O +U1Jlc291cmNlTmFtZYAsgCqAK1dOU0ltYWdlXxAPTlNNZW51Q2hlY2ttYXJr0gA3ADgA5ADlogDlADtf +EBBOU0N1c3RvbVJlc291cmNl0wAOADIA3QDeAN8A6YAsgCqALl8QEE5TTWVudU1peGVkU3RhdGXSADcA +OADsAO2iAO0AO1pOU01lbnVJdGVtXxAWaGlkZU90aGVyQXBwbGljYXRpb25zOtIANwA4APAA8aMA8QC+ +ADtfEBVOU05pYkNvbnRyb2xDb25uZWN0b3LTAA4AsACxAMAA9AD1gDGAM4A32AAOAMQAxQDGAMcAyADJ +AMoAywD4APkA+gDPANAA0QD9gC+ANRIAEAAAgDaAKYAtgDTTAA4AxADVANYBAAEBgGuAe4B8XxATTmV3 +QXBwbGljYXRpb24gSGVscFE/WXNob3dIZWxwOtMADgCwALEAwAEHAQiAMYA5gD3YAA4AxADFAMYAxwDI +AMkAygDLAQsA+QEMAM8A0ADRAQ+AL4A7gDyAKYAtgDrUAA4AxADUANUA1gESARMBFIBrgJWAmICXVFpv +b21QXHBlcmZvcm1ab29tOtMADgCwALEAwAEaARuAMYA/gEHYAA4AxADFAMYAxwDIAMkAygDLAR4A+QEM +AM8A0ADRANKAL4BAgDyAKYAtgCZYU2hvdyBBbGxfEBZ1bmhpZGVBbGxBcHBsaWNhdGlvbnM61AAOAK8A +sACxAMAAHwEoASmAMYACgEOARdcADgDEAMYAxwDIAMkAygDLASwBDADPANAA0QDSgC+ARIA8gCmALYAm +agBBAGIAbwB1AHQAIDDXMOwwpP8BXxAdb3JkZXJGcm9udFN0YW5kYXJkQWJvdXRQYW5lbDrTAA4AsACx +AMABNQE2gDGAR4BJ2AAOAMQAxQDGAMcAyADJAMoAywE5APkAzgDPANAA0QDSgC+ASIAogCmALYAmaQBI +AGkAZABlACAw1zDsMKT/AVVoaWRlOtQADgCvALAAsQDAALQBQwFEgDGAIIBLgE/YAA4AxADFAMYAxwDI +AMkAygDLAUcA+QFIAM8A0ADRAUuAL4BNgE6AKYAtgEzTAA4AxADVANYBTgFPgGuAbIBtXExvYWQgLkVM +Ri4uLlFvWEJvb3RFbGY61AAOAK8AsACxALIAtAFWAVeAI4AggFGAUtIADgAyADMANIAEgANYZGVsZWdh +dGXTAA4AsACxAMABXgFfgDGAVIBX2AAOAMQAxQDGAMcAyADJAMoAywFiAPkBYwDPANAA0QDSgC+AVYBW +gCmALYAmaQBRAHUAaQB0ACAw1zDsMKT/AVFxWnRlcm1pbmF0ZTrTAA4AsACxAMABbAFtgDGAWYBb2AAO +AMQAxQDGAMcAyADJAMoAywFwAPkBDADPANAA0QEPgC+AWoA8gCmALYA6XxASQnJpbmcgQWxsIHRvIEZy +b250XxAPYXJyYW5nZUluRnJvbnQ60wAOALAAsQDAAXkBeoAxgF2AYNgADgDEAMUAxgDHAMgAyQDKAMsB +fQD5AX4AzwDQANEBD4AvgF6AX4ApgC2AOlhNaW5pbWl6ZVFtXxATcGVyZm9ybU1pbmlhdHVyaXplOtIA +DgA+AYYBh4CerxAqAMEBiQGKAPQBGgFLAVYBBwDSAV4BkgGTAEwBKAD9AZcBeQGZAZoBmwGcAZ0BbAGf +AaABoQGiAaMBQwGlAaYAaQGoAakAQQGrAawBrQE1AQ8BsAC0gCWAYoBlgDOAP4BMgFGAOYAmgFSAd4B6 +gAuAQ4A0gH2AXYBzgHWAgIB4gISAWYCJgHKAkYBogHSAS4CLgI6ADoCHgJKAB4CUgG6AmYBHgDqAfoAg +2AAOAMQAxQDGAMcAyADJAMoAywG0APkBtQDPANAA0QDSgC+AY4BkgCmALYAmbABQAHIAZQBmAGUAcgBl +AG4AYwBlAHMgJlEs2gAOAbwAxADFAMYAxwDIAMkAygG9AMsBogHAAPkBDADPANAA0QDSAcVZTlNTdWJt +ZW51WE5TQWN0aW9ugC+AaIBmgDyAKYAtgCaAZ1hTZXJ2aWNlc15zdWJtZW51QWN0aW9uOtQADgDEANQA +1QDWAcABywHMgGuAZoBqgGnSAA4APgBnAc+AF6BfEA9fTlNTZXJ2aWNlc01lbnXSADcAOAHSAMqiAMoA +O1RGaWxl0gAOAD4AZwHWgBeiAawBQ4BugEvYAA4AxADFAMYAxwDIAMkAygDLAdsA+QEMAM8A0ADRAUuA +L4BvgDyAKYAtgExbQm9vdCBjZHJvbTBeTmV3QXBwbGljYXRpb27SAA4APgBnAeSAF6sBKAGgAYkBmQGK +AaMBNQDBARoBmgFegEOAcoBigHOAZYB0gEeAJYA/gHWAVNoADgDEAMUB8QDGAfIAxwDIAMkAygDLAQwA ++QH1AQwB9QDPANAA0QDSXU5TSXNTZXBhcmF0b3JcTlNJc0Rpc2FibGVkgC+APAmAPAmAKYAtgCbaAA4A +xADFAfEAxgHyAMcAyADJAMoAywEMAPkB9QEMAfUAzwDQANEA0oAvgDwJgDwJgCmALYAm2gAOAMQAxQHx +AMYB8gDHAMgAyQDKAMsBDAD5AfUBDAH1AM8A0ADRANKAL4A8CYA8CYApgC2AJtoADgDEAMUB8QDGAfIA +xwDIAMkAygDLAQwA+QH1AQwB9QDPANAA0QDSgC+APAmAPAmAKYAtgCZcX05TQXBwbGVNZW512AAOAMQA +xQDGAMcAyADJAMoAywIZAPkBDADPANAA0QGcgC+AeYA8gCmALYB40wAOAMQA1QDWAiACIYBrgIGAg18Q +FVBhdXNlIFdoZW4gRm9jdXMgTG9zdNoADgDEAMUB8QDGAfIAxwDIAMkAygDLAQwA+QH1AQwB9QDPANAA +0QGcgC+APAmAPAmAKYAtgHhUSGVscNIADgA+AGcCL4AXoQD0gDPaAA4BvADEAMUAxgDHAMgAyQDKAb0A +ywDSANcA+QEMAM8A0ADRAbACOYAvgCaAcIA8gCmALYB+gH/UAA4AxADUANUA1gI8Aj0CPoBrgJuAnYCc +2gAOAbwAxADFAMYAxwDIAMkAygG9AMsBnAIgAPkBDADPANAA0QGwAkeAL4B4gIGAPIApgC2AfoCCXxAP +VmlydHVhbCBNYWNoaW5l0gAOAD4AZwJLgBenAZ0BqAGSAZMBnwGlAaaAhICHgHeAeoCJgIuAjtgADgDE +AMUAxgDHAMgAyQDKAMsCVQD5AlYAzwDQANEBnIAvgIWAhoApgC2AeF5QYXVzZSAvIFJlc3VtZVFy2AAO +AMQAxQDGAMcAyADJAMoAywJeAPkBDADPANAA0QGcgC+AiIA8gCmALYB4VVJlc2V02AAOAMQAxQDGAMcA +yADJAMoAywJmAPkBDADPANAA0QGcgC+AioA8gCmALYB4WlN0YXRlIFNsb3TYAA4AxADFAMYAxwDIAMkA +ygDLAm4A+QJvAM8A0ADRAZyAL4CMgI2AKYAtgHhaU2F2ZSBTdGF0ZVFz2AAOAMQAxQDGAMcAyADJAMoA +ywJ3APkCeADPANAA0QGcgC+Aj4CQgCmALYB4WkxvYWQgU3RhdGVRbNoADgDEAMUB8QDGAfIAxwDIAMkA +ygDLAQwA+QH1AQwB9QDPANAA0QEPgC+APAmAPAmAKYAtgDraAA4BvADEAMUAxgDHAMgAyQDKAb0AywFL +AU4A+QEMAM8A0ADRAbACj4AvgEyAbIA8gCmALYB+gJPaAA4BvADEAMUAxgDHAMgAyQDKAb0AywEPARIA ++QEMAM8A0ADRAbACmIAvgDqAlYA8gCmALYB+gJZWV2luZG930gAOAD4AZwKcgBekAXkBBwGhAWyAXYA5 +gJGAWV5fTlNXaW5kb3dzTWVuddoADgG8AMQAxQDGAMcAyADJAMoBvQDLAP0BAAD5AQwAzwDQANEBsAKq +gC+ANIB7gDyAKYAtgH6AmllBTWFpbk1lbnXSAA4APgBnAq6AF6UBlwGpAZsBqwGtgH2AkoCAgJSAmVtf +TlNNYWluTWVuddIANwA4ArYAk6IAkwA70gAOAD4BhgK5gJ6vECoA0gDSANIA/QDSAakAHwEPAZcA0gGc +AZwAQQDSAa0BsAEPANIA0gGwAZsBnAEPAZwA0gEPAYoA0gFLAZwBnABMAZwBsAAfAbABSwGwANIBqwAf +AB+AJoAmgCaANIAmgJKAAoA6gH2AJoB4gHiAB4AmgJmAfoA6gCaAJoB+gICAeIA6gHiAJoA6gGWAJoBM +gHiAeIALgHiAfoACgH6ATIB+gCaAlIACgALSAA4APgGGAuaAnq8QKwFLAMEBiQGKARoBkwFWANIBXgBM +AZIBBwAfAPQBKAGcAZcBmwD9AGkBmQGaAZ0BnwGlAaABpgF5AaMBQwFsAaEBogGoAEEBqQGrAawBrQE1 +AQ8BsAC0gEyAJYBigGWAP4B6gFGAJoBUgAuAd4A5gAKAM4BDgHiAfYCAgDSADoBzgHWAhICJgIuAcoCO +gF2AdIBLgFmAkYBogIeAB4CSgJSAboCZgEeAOoB+gCDSAA4APgGGAxSAnq8QKwMVAxYDFwMYAxkDGgMb +AxwDHQMeAx8DIAMhAyIDIwMkAyUDJgMnAygDKQMqAysDLAMtAy4DLwMwAzEDMgMzAzQDNQM2AzcDOAM5 +AzoDOwM8Az0DPgM/gKKAo4CkgKWApoCngKiAqYCqgKuArICtgK6Ar4CwgLGAsoCzgLSAtYC2gLeAuIC5 +gLqAu4C8gL2AvoC/gMCAwYDCgMOAxIDFgMaAx4DIgMmAyoDLgMxbTWVudSAoRmlsZSlfEBdNZW51IEl0 +ZW0gKEhpZGUgT3RoZXJzKVMxMjFfEBRNZW51IEl0ZW0gKFNlcnZpY2VzKV8QFE1lbnUgSXRlbSAoU2hv +dyBBbGwpW1NlcGFyYXRvci00W0FwcGxpY2F0aW9uXxAVTWVudSAoTmV3QXBwbGljYXRpb24pVDExMTFc +Q29udGVudCBWaWV3XxAhTWVudSBJdGVtIChQYXVzZSBXaGVuIEZvY3VzIExvc3QpXxAQTWVudSBJdGVt +IChab29tKVxGaWxlJ3MgT3duZXJfEB9NZW51IEl0ZW0gKE5ld0FwcGxpY2F0aW9uIEhlbHApbxAWAE0A +ZQBuAHUAIABJAHQAZQBtACAAKABBAGIAbwB1AHQAIDDXMOwwpP8BAClfEBZNZW51IChWaXJ0dWFsIE1h +Y2hpbmUpXxAaTWVudSBJdGVtIChOZXdBcHBsaWNhdGlvbilfEBtNZW51IEl0ZW0gKFZpcnR1YWwgTWFj +aGluZSlRMltPcGVuR0wgVmlld1lTZXBhcmF0b3JbU2VwYXJhdG9yLTFfEBpNZW51IEl0ZW0gKFBhdXNl +IC8gUmVzdW1lKV8QFk1lbnUgSXRlbSAoU3RhdGUgU2xvdClfEBZNZW51IEl0ZW0gKFNhdmUgU3RhdGUp +W1NlcGFyYXRvci0yXxAWTWVudSBJdGVtIChMb2FkIFN0YXRlKV8QFE1lbnUgSXRlbSAoTWluaW1pemUp +W1NlcGFyYXRvci0zXxAYTWVudSBJdGVtIChMb2FkIC5FTEYuLi4pXxAeTWVudSBJdGVtIChCcmluZyBB +bGwgdG8gRnJvbnQpW1NlcGFyYXRvci01XxAPTWVudSAoU2VydmljZXMpXxARTWVudSBJdGVtIChSZXNl +dClvEB0AVwBpAG4AZABvAHcAIAAoMNcw7DCk/wEAIAAtACAATwB1AHQAcAB1AHQAIABXAGkAbgBkAG8A +dwApXxAQTWVudSBJdGVtIChGaWxlKV8QEk1lbnUgSXRlbSAoV2luZG93KV8QF01lbnUgSXRlbSAoQm9v +dCBjZHJvbTApUTFvEBUATQBlAG4AdQAgAEkAdABlAG0AIAAoAEgAaQBkAGUAIDDXMOwwpP8BACldTWVu +dSAoV2luZG93KVhNYWluTWVudV8QFEFwcGxpY2F0aW9uIERlbGVnYXRl0gAOAD4BhgNtgJ6g0gAOAD4B +hgNwgJ6g0gAOAD4BhgNzgJ6vEDcBSwGJAYoA9AEaAZMBVgEHANIBkgCrAKwAHwCtASgA/QGcAXkBpgCp +AKoBpQGgAaIBowCiAagBrACoATUBDwGwALQAwQFeAEwApABpAZcBmQGaAZsBnQGfAKMBbAGhAUMApQGp +AEEApwGrAa0ApoBMgGKAZYAzgD+AeoBRgDmAJoB3gFOAWIACgFyAQ4A0gHiAXYCOgEqAUICLgHKAaIB0 +gB+Ah4BugEaAR4A6gH6AIIAlgFSAC4AygA6AfYBzgHWAgICEgImAJIBZgJGAS4A4gJKAB4BCgJSAmYA+ +0gAOAD4BhgOtgJ6vEDcDrgOvA7ADsQOyA7MDtAO1A7YDtwO4A7kDugO7A7wDvQO+A78DwAPBA8IDwwPE +A8UDxgPHA8gDyQPKA8sDzAPNA84DzwPQA9ED0gPTA9QD1QPWA9cD2APZA9oD2wPcA90D3gPfA+AD4QPi +A+MD5IDRgNKA04DUgNWA1oDXgNiA2YDagNuA3IDdgN6A34DggOGA4oDjgOSA5YDmgOeA6IDpgOqA64Ds +gO2A7oDvgPCA8YDygPOA9ID1gPaA94D4gPmA+oD7gPyA/YD+gP+BAQCBAQGBAQKBAQOBAQSBAQWBAQaB +AQcRAXsQgRCDEG8QlhEBhBP//////////RDvEDkRAYMRAXEQJxEBjhAlEDoQahEBgBAXEQGHEQGMEQGL +EQGGEOwQghCQEQGNEQGCEQF8EQFvEIYQGBAdEQGKEJEQiBEBdBEBaBEBdxA4EI8QlREBfxEBgREBhREB +cBAFEFwRAX0Q8BBTEQFzEI4QExBnEQFy0gAOAD4AZwQegBeg0gAOAD4BhgQhgJ6g0gAOAD4BhgQkgJ6g +0gA3ADgEJgQnogQnADteTlNJQk9iamVjdERhdGEACAAZACIAJwAxADoAPwBEAFIAVABmAoICiALTAtoC +4QLvAwEDHQMrAzcDQwNRA1wDagOGA5QDpwO5A9MD3QPqA+wD7wPxA/MD9gP4A/oD/AP+BAAEAgQFBAcE +CQQLBA4EEQQTBBwEKAQqBCwEOgRDBEwEVwRcBGsEdASHBJAEmwSdBKAEogTLBNgE5QTzBP0FCwUYBSoF +PgVKBUwFTgVQBVIFVwVZBVsFXQVfBWEFfAWnBbAFzQXfBeoF8wX/BgsGDQYPBhEGFAYWBhgGGgYjBiUG +KAYqBksGUwZhBm4GcAZyBnQGdgZ5BnsGfQZ/BoQGhgaPBpQGnwa3BsAG1AbWBtgG4QbpBusG/gcHBw4H +HAcjBywHMQdHB1AHWQdmB20HeQeCB4kHmAegB6sHtAe7B9MH3AfhB/QH/QgECBEIFwggCCIIOwg9CD8I +QQhDCEUIRwhJCEsITQhPCFEIUwhkCHIIewiDCIUIhwiJCIsIlAiWCJgIrwi8CMUIzAjjCPII/wkBCQMJ +BQkmCS4JQglNCVsJZQlyCXkJewl9CYIJhAmJCYsJjQmPCaAJpwmzCbUJtwm5CbsJxwnJCdYJ5QnnCekJ +6wnzCgUKDgoTCiYKMwo1CjcKOQpMClUKWgplCn4KhwqOCqYKswq1CrcKuQraCtwK3grjCuUK5wrpCusK ++Ar6CvwK/gsUCxYLIAstCy8LMQszC1QLVgtYC1oLXAteC2ALcQtzC3ULdwt5C34LfwuMC5kLmwudC58L +wAvCC8QLxgvIC8oLzAvVC+4L/wwBDAMMBQwHDCQMJgwoDCoMLAwuDDAMRQxlDHIMdAx2DHgMmQybDJ0M +nwyhDKMMpQy4DL4MzwzRDNMM1QzXDPgM+gz8DP4NAA0CDQQNEQ0TDRUNFw0kDSYNLw1ADUINRA1GDUgN +UQ1TDVUNXg1rDW0Nbw1xDZINlA2WDZgNmg2cDZ4NsQ2zDb4Nyw3NDc8N0Q3yDfQN9g34DfoN/A3+DhMO +JQ4yDjQONg44DlkOWw5dDl8OYQ5jDmUObg5wDoYOjw6RDugO6g7sDu4O8A7yDvQO9g74DvoO/A7+DwAP +Ag8EDwYPCA8KDwwPDg8QDxIPFA8WDxgPGg8cDx4PIA8iDyQPJg8oDyoPLA8uDzAPMg80DzYPOA86DzwP +XQ9fD2EPYw9lD2cPaQ+CD4QPrQ+3D8APwg/ED8YPyA/KD8wPzg/QD9kP6A/5D/sP/Q//EAEQChAMEA0Q +HxAoEC0QMhA7ED0QQhBEEEYQZxBpEGsQbRBvEHEQcxB/EI4QlxCZELAQshC0ELYQuBC6ELwQvhDAEMIQ +xBDGEO8Q/REKEQwRDhEPEREREhEUERYRGBFBEUMRRRFGEUgRSRFLEU0RTxF4EXoRfBF9EX8RgBGCEYQR +hhGvEbERsxG0EbYRtxG5EbsRvRHKEesR7RHvEfER8xH1EfcSBBIGEggSChIiEksSTRJPElASUhJTElUS +VxJZEl4SZxJpEmwSbhKXEpkSmxKdEp8SoRKjEqUSpxK4EroSvBK+EsAS6RLrEu0S7xLxEvMS9RL3EvkT +CxMUExYTJRMnEykTKxMtEy8TMRMzE1QTVhNYE1oTXBNeE2ATbxNxE5ITlBOWE5gTmhOcE54TpBPFE8cT +yRPLE80TzxPRE9wT/RP/FAEUAxQFFAcUCRQUFBYUNxQ5FDsUPRQ/FEEUQxROFFAUeRR7FH0UfhSAFIEU +gxSFFIcUsBSyFLQUthS4FLoUvBS+FMAU6RTrFO0U7xTxFPMU9RT3FPkVABUJFQsVFBUWFRgVGhUcFSsV +VBVWFVgVWhVcFV4VYBViFWQVbhV3FXkVhBWGFYgVihWMFY4VmhWjFagVsRWzFgoWDBYOFhAWEhYUFhYW +GBYaFhwWHhYgFiIWJBYmFigWKhYsFi4WMBYyFjQWNhY4FjoWPBY+FkAWQhZEFkYWSBZKFkwWThZQFlIW +VBZWFlgWWhZcFl4WZxZpFsIWxBbGFsgWyhbMFs4W0BbSFtQW1hbYFtoW3BbeFuAW4hbkFuYW6BbqFuwW +7hbwFvIW9Bb2FvgW+hb8Fv4XABcCFwQXBhcIFwoXDBcOFxAXEhcUFxYXGBchFyMXfBd+F4AXgheEF4YX iBeKF4wXjheQF5IXlBeWF5gXmhecF54XoBeiF6QXpheoF6oXrBeuF7AXshe0F7YXuBe6F7wXvhfAF8IX -xBfQF+4X+hgXGBkYSBhsGIMYjxisGLUYwRjiGPQZDBkaGVcZXBloGX8ZmhmcGbEZvRnRGeoaAxocGiga -Mho/GkwaUBpnGoEalBrBGtoa/BsWGy0bORtMG1UbVxtYG2EbYxtkG20bbxvgG+Ib5BvmG+gb6hvsG+4b +xBfGF8gXyhfMF84X0BfSF94X+Bf8GBMYKhg2GEIYWhhfGGwYkBijGLAY0hkBGRoZNxlVGVcZYxltGXkZ +lhmvGcgZ1BntGgQaEBorGkwaWBpqGn4auxrOGuMa/Rr/GywbOhtDG1obYxtlG2YbbxtxG3Ibext9G+4b 8BvyG/Qb9hv4G/ob/Bv+HAAcAhwEHAYcCBwKHAwcDhwQHBIcFBwWHBgcGhwcHB4cIBwiHCQcJhwoHCoc -LBwuHDAcMhw0HDYcOBw6HDwcPhxAHEIcRBxGHEgcShxMHE4cVxxZHMoczBzOHNAc0hzUHNYc2BzaHNwc +LBwuHDAcMhw0HDYcOBw6HDwcPhxAHEIcRBxGHEgcShxMHE4cUBxSHFQcVhxYHFocXBxlHGcc2BzaHNwc 3hzgHOIc5BzmHOgc6hzsHO4c8BzyHPQc9hz4HPoc/Bz+HQAdAh0EHQYdCB0KHQwdDh0QHRIdFB0WHRgd -Gh0cHR4dIB0iHSQdJh0oHSsdLh0xHTQdNx06HT0dQB1DHUUdRx1KHU0dUB1SHVUdWB1bHV0dXx1hHWMd -ZR1nHWkdax1tHXAdcx12HXkdfB1/HYEdgx2GHYgdix2OHZAdkh2UHZYdmR2bHZ0dnx2hHaMdph2pHasd -rh2xHbQdth2/HcEdwx3GHckdzB3OHdcd2R3aHeMd5R3mHe8d8R3yHfseAAAAAAAAAAICAAAAAAAABCgA -AAAAAAAAAAAAAAAAAB4PA +Gh0cHR4dIB0iHSQdJh0oHSodLB0uHTAdMh00HTYdOR08HT8dQh1FHUgdSx1OHVEdUx1VHVcdWR1cHWUd +Zx1pHWwdbx1xHXQddh14HXodfR1/HYIdhR2IHYsdjR2PHZEdlB2XHZodnR2fHaEdox2mHagdqh2tHbAd +sx21HbcduR28Hb8dwh3FHccdyR3MHc4d0B3THdUd1x3ZHdwd5R3nHegd8R3zHfQd/R3/HgAeCR4OAAAA +AAAAAgIAAAAAAAAEKAAAAAAAAAAAAAAAAAAAHh0 diff --git a/Source/macosxui/English.lproj/MainMenu.nib/keyedobjects.nib b/Source/macosxui/English.lproj/MainMenu.nib/keyedobjects.nib index f17fcc7961873108c047b08cfe89dee52b503f90..b112bfdf6e519c11d64d5864f8beb23f6c1bd068 100644 GIT binary patch delta 5922 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 I>jvuo04)iVo&W#< delta 5892 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 K^s-Lv!2TcRf^=5^ diff --git a/Source/macosxui/GSH_OpenGLMacOSX.cpp b/Source/macosxui/GSH_OpenGLMacOSX.cpp index 37e0c23f..03d680bf 100644 --- a/Source/macosxui/GSH_OpenGLMacOSX.cpp +++ b/Source/macosxui/GSH_OpenGLMacOSX.cpp @@ -24,7 +24,6 @@ void CGSH_OpenGLMacOSX::InitializeImpl() void CGSH_OpenGLMacOSX::FlipImpl() { - glFlush(); CGLFlushDrawable(m_context); }