From cd4601a060fdce030a9ca90842ff7ad51beddf56 Mon Sep 17 00:00:00 2001 From: Marti Maria Date: Mon, 2 Jul 2012 18:55:12 +0200 Subject: Mac XCode update for 2.4 --- Projects/mac/._.DS_Store | Bin 4096 -> 0 bytes Projects/mac/LittleCMS/._.DS_Store | Bin 4096 -> 0 bytes Projects/mac/LittleCMS/Info.plist | 10 +-- .../LittleCMS/LittleCMS.xcodeproj/mariama.mode1v3 | 61 ++++++++-------- .../LittleCMS/LittleCMS.xcodeproj/mariama.pbxuser | 79 +++++++++------------ .../LittleCMS/LittleCMS.xcodeproj/project.pbxproj | 8 +++ 6 files changed, 78 insertions(+), 80 deletions(-) diff --git a/Projects/mac/._.DS_Store b/Projects/mac/._.DS_Store index 338bd7b..e69de29 100755 Binary files a/Projects/mac/._.DS_Store and b/Projects/mac/._.DS_Store differ diff --git a/Projects/mac/LittleCMS/._.DS_Store b/Projects/mac/LittleCMS/._.DS_Store index 338bd7b..e69de29 100755 Binary files a/Projects/mac/LittleCMS/._.DS_Store and b/Projects/mac/LittleCMS/._.DS_Store differ diff --git a/Projects/mac/LittleCMS/Info.plist b/Projects/mac/LittleCMS/Info.plist index 875d35e..002d6a9 100644 --- a/Projects/mac/LittleCMS/Info.plist +++ b/Projects/mac/LittleCMS/Info.plist @@ -1,5 +1,5 @@ - + CFBundleDevelopmentRegion @@ -14,12 +14,12 @@ 6.0 CFBundlePackageType FMWK + CFBundleShortVersionString + 1.01 CFBundleSignature - ???? + lcms CFBundleVersion - 1.0 - CFBundleShortVersionString - 1.01 + 2.4 CSResourcesFileMapped diff --git a/Projects/mac/LittleCMS/LittleCMS.xcodeproj/mariama.mode1v3 b/Projects/mac/LittleCMS/LittleCMS.xcodeproj/mariama.mode1v3 index aabb78c..6e34d0a 100644 --- a/Projects/mac/LittleCMS/LittleCMS.xcodeproj/mariama.mode1v3 +++ b/Projects/mac/LittleCMS/LittleCMS.xcodeproj/mariama.mode1v3 @@ -280,6 +280,8 @@ Layout + BecomeActive + ContentConfiguration PBXBottomSmartGroupGIDs @@ -315,17 +317,20 @@ PBXSmartGroupTreeModuleOutlineStateExpansionKey + 0867D691FE84028FC02AAC07 + 1C37FBAC04509CD000000102 1C37FABC05509CD000000102 E2644B35053B69B200211256 PBXSmartGroupTreeModuleOutlineStateSelectionKey - 0 + 7 + 6 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {389, 970}} + {{0, 0}, {389, 946}} PBXTopSmartGroupGIDs @@ -337,14 +342,14 @@ GeometryConfiguration Frame - {{0, 0}, {406, 988}} + {{0, 0}, {406, 964}} GroupTreeTableConfiguration MainColumn 389 RubberWindowFrame - 0 149 1600 1029 0 0 1600 1178 + 145 -306 1537 1005 0 0 1600 1178 Module PBXSmartGroupTreeModule @@ -360,7 +365,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - cmsio0.c + testcms2.c PBXSplitModuleInNavigatorKey Split0 @@ -368,24 +373,21 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - cmsio0.c + testcms2.c _historyCapacity 0 bookmark - 546B2A0110AC6C9E0054D33A + 54C0D5B915A2072100A94CDC history 546B29DA10AC6B6E0054D33A - 546B29DB10AC6B6E0054D33A 546B29F510AC6C480054D33A - 546B29F710AC6C480054D33A + 54DBD07515A206A100180017 prevStack 546B29E010AC6B6E0054D33A 546B29E110AC6B6E0054D33A - 546B29E210AC6B6E0054D33A - 546B29E310AC6B6E0054D33A SplitCount @@ -397,18 +399,16 @@ GeometryConfiguration Frame - {{0, 0}, {1189, 19}} + {{0, 0}, {1126, 0}} RubberWindowFrame - 0 149 1600 1029 0 0 1600 1178 + 145 -306 1537 1005 0 0 1600 1178 Module PBXNavigatorGroup Proportion - 19pt + 0pt - BecomeActive - ContentConfiguration PBXProjectModuleGUID @@ -419,18 +419,18 @@ GeometryConfiguration Frame - {{0, 24}, {1189, 964}} + {{0, 5}, {1126, 959}} RubberWindowFrame - 0 149 1600 1029 0 0 1600 1178 + 145 -306 1537 1005 0 0 1600 1178 Module XCDetailModule Proportion - 964pt + 959pt Proportion - 1189pt + 1126pt Name @@ -445,9 +445,9 @@ TableOfContents - 546B29FF10AC6C9E0054D33A + 54C0D5B315A206F900A94CDC 1CE0B1FE06471DED0097A5F4 - 546B2A0010AC6C9E0054D33A + 54C0D5B415A206F900A94CDC 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -566,7 +566,7 @@ StatusbarIsVisible TimeStamp - 279735424.79254502 + 362940193.69248402 ToolbarDisplayMode 1 ToolbarIsVisible @@ -581,10 +581,11 @@ 5 WindowOrderList - /Users/mariama/lcms-2.0/Projects/mac/LittleCMS/LittleCMS.xcodeproj + 546B297610AC61DD0054D33A + /Users/mariama/lcms2-2.4/Projects/mac/LittleCMS/LittleCMS.xcodeproj WindowString - 0 149 1600 1029 0 0 1600 1178 + 145 -306 1537 1005 0 0 1600 1178 WindowToolsV3 @@ -605,7 +606,7 @@ PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - RunUnitTests + StatusBarVisibility @@ -614,7 +615,7 @@ Frame {{0, 0}, {897, 417}} RubberWindowFrame - 645 150 897 912 0 0 1600 1178 + 645 215 897 912 0 0 1600 1178 Module PBXNavigatorGroup @@ -640,7 +641,7 @@ Frame {{0, 422}, {897, 449}} RubberWindowFrame - 645 150 897 912 0 0 1600 1178 + 645 215 897 912 0 0 1600 1178 Module PBXBuildResultsModule @@ -663,14 +664,14 @@ TableOfContents 546B297610AC61DD0054D33A - 546B297710AC61DD0054D33A + 54C0D5B815A2071B00A94CDC 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID ToolbarConfiguration xcode.toolbar.config.buildV3 WindowString - 645 150 897 912 0 0 1600 1178 + 645 215 897 912 0 0 1600 1178 WindowToolGUID 546B297610AC61DD0054D33A WindowToolIsVisible diff --git a/Projects/mac/LittleCMS/LittleCMS.xcodeproj/mariama.pbxuser b/Projects/mac/LittleCMS/LittleCMS.xcodeproj/mariama.pbxuser index 8991514..71ebaa9 100644 --- a/Projects/mac/LittleCMS/LittleCMS.xcodeproj/mariama.pbxuser +++ b/Projects/mac/LittleCMS/LittleCMS.xcodeproj/mariama.pbxuser @@ -60,7 +60,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 950, + 887, 20, 48, 43, @@ -134,7 +134,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 910, + 847, 60, 20, 48, @@ -151,19 +151,18 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 279735424; - PBXWorkspaceStateSaveDate = 279735424; + PBXPerProjectTemplateStateSaveDate = 362940143; + PBXWorkspaceStateSaveDate = 362940143; }; perUserProjectItems = { - 546B29DA10AC6B6E0054D33A /* PBXTextBookmark */ = 546B29DA10AC6B6E0054D33A /* PBXTextBookmark */; - 546B29DB10AC6B6E0054D33A /* PBXTextBookmark */ = 546B29DB10AC6B6E0054D33A /* PBXTextBookmark */; - 546B29E010AC6B6E0054D33A /* PBXTextBookmark */ = 546B29E010AC6B6E0054D33A /* PBXTextBookmark */; - 546B29E110AC6B6E0054D33A /* PBXTextBookmark */ = 546B29E110AC6B6E0054D33A /* PBXTextBookmark */; - 546B29E210AC6B6E0054D33A /* PBXTextBookmark */ = 546B29E210AC6B6E0054D33A /* PBXTextBookmark */; - 546B29E310AC6B6E0054D33A /* PBXTextBookmark */ = 546B29E310AC6B6E0054D33A /* PBXTextBookmark */; - 546B29F510AC6C480054D33A /* PBXTextBookmark */ = 546B29F510AC6C480054D33A /* PBXTextBookmark */; - 546B29F710AC6C480054D33A /* PBXTextBookmark */ = 546B29F710AC6C480054D33A /* PBXTextBookmark */; - 546B2A0110AC6C9E0054D33A /* PBXTextBookmark */ = 546B2A0110AC6C9E0054D33A /* PBXTextBookmark */; + 546B29DA10AC6B6E0054D33A = 546B29DA10AC6B6E0054D33A /* PBXTextBookmark */; + 546B29E010AC6B6E0054D33A = 546B29E010AC6B6E0054D33A /* PBXTextBookmark */; + 546B29E110AC6B6E0054D33A = 546B29E110AC6B6E0054D33A /* PBXTextBookmark */; + 546B29E210AC6B6E0054D33A = 546B29E210AC6B6E0054D33A /* PBXTextBookmark */; + 546B29F510AC6C480054D33A = 546B29F510AC6C480054D33A /* PBXTextBookmark */; + 54C0D5B215A206F900A94CDC /* PBXTextBookmark */ = 54C0D5B215A206F900A94CDC /* PBXTextBookmark */; + 54C0D5B915A2072100A94CDC /* PBXTextBookmark */ = 54C0D5B915A2072100A94CDC /* PBXTextBookmark */; + 54DBD07515A206A100180017 = 54DBD07515A206A100180017 /* PBXTextBookmark */; }; sourceControlManager = 546B292F10AC5E210054D33A /* Source Control */; userBuildSettings = { @@ -182,7 +181,7 @@ }; 546B293810AC5E4A0054D33A /* cmsio0.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1128, 23044}}"; + sepNavIntBoundsRect = "{{0, 0}, {1065, 24374}}"; sepNavSelRange = "{25921, 0}"; sepNavVisRange = "{0, 0}"; }; @@ -237,9 +236,9 @@ }; 546B29AD10AC68410054D33A /* testcms2.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {710, 93590}}"; + sepNavIntBoundsRect = "{{0, 0}, {1065, 110054}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 1115}"; + sepNavVisRange = "{0, 0}"; sepNavWindowFrame = "{{61, 247}, {1099, 884}}"; }; }; @@ -253,16 +252,6 @@ vrLen = 172; vrLoc = 9140; }; - 546B29DB10AC6B6E0054D33A /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 546B29AD10AC68410054D33A /* testcms2.c */; - name = "testcms2.c: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1115; - vrLoc = 0; - }; 546B29E010AC6B6E0054D33A /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 546B299D10AC672A0054D33A /* RunUnitTests */; @@ -293,16 +282,6 @@ vrLen = 1115; vrLoc = 0; }; - 546B29E310AC6B6E0054D33A /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 546B293810AC5E4A0054D33A /* cmsio0.c */; - name = "cmsio0.c: 845"; - rLen = 0; - rLoc = 25921; - rType = 0; - vrLen = 982; - vrLoc = 25453; - }; 546B29F510AC6C480054D33A /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 546B296B10AC5EAA0054D33A /* TestBed-Info.plist */; @@ -313,22 +292,32 @@ vrLen = 671; vrLoc = 0; }; - 546B29F710AC6C480054D33A /* PBXTextBookmark */ = { + 54C0D5B215A206F900A94CDC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 546B29AD10AC68410054D33A /* testcms2.c */; + name = "testcms2.c: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 54C0D5B915A2072100A94CDC /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 546B293810AC5E4A0054D33A /* cmsio0.c */; - name = "cmsio0.c: 845"; + fRef = 546B29AD10AC68410054D33A /* testcms2.c */; + name = "testcms2.c: 1"; rLen = 0; - rLoc = 25921; + rLoc = 0; rType = 0; - vrLen = 1922; + vrLen = 0; vrLoc = 0; }; - 546B2A0110AC6C9E0054D33A /* PBXTextBookmark */ = { + 54DBD07515A206A100180017 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 546B293810AC5E4A0054D33A /* cmsio0.c */; - name = "cmsio0.c: 845"; + fRef = 546B29AD10AC68410054D33A /* testcms2.c */; + name = "testcms2.c: 1"; rLen = 0; - rLoc = 25921; + rLoc = 0; rType = 0; vrLen = 0; vrLoc = 0; diff --git a/Projects/mac/LittleCMS/LittleCMS.xcodeproj/project.pbxproj b/Projects/mac/LittleCMS/LittleCMS.xcodeproj/project.pbxproj index a9fa0a5..44b52b8 100644 --- a/Projects/mac/LittleCMS/LittleCMS.xcodeproj/project.pbxproj +++ b/Projects/mac/LittleCMS/LittleCMS.xcodeproj/project.pbxproj @@ -34,6 +34,8 @@ 546B296310AC5E600054D33A /* lcms2.h in Headers */ = {isa = PBXBuildFile; fileRef = 546B296110AC5E600054D33A /* lcms2.h */; settings = {ATTRIBUTES = (Public, ); }; }; 546B296410AC5E600054D33A /* lcms2_plugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 546B296210AC5E600054D33A /* lcms2_plugin.h */; settings = {ATTRIBUTES = (Public, ); }; }; 546B29AE10AC68410054D33A /* testcms2.c in Sources */ = {isa = PBXBuildFile; fileRef = 546B29AD10AC68410054D33A /* testcms2.c */; }; + 54DBD06115A202B200180017 /* cmshalf.c in Sources */ = {isa = PBXBuildFile; fileRef = 54DBD06015A202B200180017 /* cmshalf.c */; }; + 54DBD06215A202BB00180017 /* cmshalf.c in Sources */ = {isa = PBXBuildFile; fileRef = 54DBD06015A202B200180017 /* cmshalf.c */; }; 8D07F2BE0486CC7A007CD1D0 /* LittleCMS_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 32BAE0B70371A74B00C91783 /* LittleCMS_Prefix.pch */; settings = {ATTRIBUTES = (Private, ); }; }; 8D07F2C00486CC7A007CD1D0 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; }; 8D07F2C40486CC7A007CD1D0 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB77AAFE841565C02AAC07 /* Carbon.framework */; }; @@ -83,6 +85,7 @@ 546B29A310AC677E0054D33A /* testbed */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testbed; sourceTree = BUILT_PRODUCTS_DIR; }; 546B29AC10AC682F0054D33A /* lcms2_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lcms2_internal.h; path = ../../../src/lcms2_internal.h; sourceTree = SOURCE_ROOT; }; 546B29AD10AC68410054D33A /* testcms2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testcms2.c; path = ../../../testbed/testcms2.c; sourceTree = SOURCE_ROOT; }; + 54DBD06015A202B200180017 /* cmshalf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmshalf.c; path = ../../../src/cmshalf.c; sourceTree = ""; }; 8D07F2C70486CC7A007CD1D0 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 8D07F2C80486CC7A007CD1D0 /* LittleCMS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LittleCMS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -147,6 +150,7 @@ 08FB77ACFE841707C02AAC07 /* Source */ = { isa = PBXGroup; children = ( + 54DBD06015A202B200180017 /* cmshalf.c */, 546B29AD10AC68410054D33A /* testcms2.c */, 546B29AC10AC682F0054D33A /* lcms2_internal.h */, 546B296110AC5E600054D33A /* lcms2.h */, @@ -279,6 +283,7 @@ buildActionMask = 2147483647; files = ( 546B29AE10AC68410054D33A /* testcms2.c in Sources */, + 54DBD06115A202B200180017 /* cmshalf.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -310,6 +315,7 @@ 546B295E10AC5E4A0054D33A /* cmsvirt.c in Sources */, 546B295F10AC5E4A0054D33A /* cmswtpnt.c in Sources */, 546B296010AC5E4A0054D33A /* cmsxform.c in Sources */, + 54DBD06215A202BB00180017 /* cmshalf.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -342,6 +348,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; + GCC_CHAR_IS_UNSIGNED_CHAR = YES; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; @@ -369,6 +376,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; + GCC_CHAR_IS_UNSIGNED_CHAR = YES; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = LittleCMS_Prefix.pch; -- cgit v1.2.1