Move the platform files form port to skia for Mac only. Hopefully this won't ...

skia/skia.xcodeproj/project.pbxproj

Index: skia/skia.xcodeproj/project.pbxproj
===================================================================
--- skia/skia.xcodeproj/project.pbxproj	(revision 5826)
+++ skia/skia.xcodeproj/project.pbxproj	(working copy)
@@ -10,6 +10,9 @@
 		7B4DF47E0E5B5FE0004D7619 /* SkNinePatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B4DF47D0E5B5FE0004D7619 /* SkNinePatch.cpp */; };
 		7B4DF4800E5B6005004D7619 /* SkScaledBitmapSampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B4DF47F0E5B6005004D7619 /* SkScaledBitmapSampler.cpp */; };
 		7B4DF48A0E5B609B004D7619 /* SkTypeface_fake.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B4DF4820E5B6087004D7619 /* SkTypeface_fake.cpp */; };
+		A70A3BAE0ED7385F00C31871 /* bitmap_platform_device_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = A70A3BA80ED7385F00C31871 /* bitmap_platform_device_mac.cc */; };
+		A70A3BAF0ED7385F00C31871 /* platform_canvas_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = A70A3BAA0ED7385F00C31871 /* platform_canvas_mac.cc */; };
+		A70A3BB00ED7385F00C31871 /* platform_device_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = A70A3BAC0ED7385F00C31871 /* platform_device_mac.cc */; };
 		E48EE4D20E34E873009DE966 /* Sk1DPathEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C46860DAE9C4F00FC0DB7 /* Sk1DPathEffect.cpp */; };
 		E48EE4D30E34E873009DE966 /* Sk2DPathEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C46870DAE9C4F00FC0DB7 /* Sk2DPathEffect.cpp */; };
 		E48EE4D40E34E873009DE966 /* Sk64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C465C0DAE9C4A00FC0DB7 /* Sk64.cpp */; };
@@ -144,6 +147,12 @@
 		7B4DF47F0E5B6005004D7619 /* SkScaledBitmapSampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkScaledBitmapSampler.cpp; sourceTree = "<group>"; };
 		7B4DF4810E5B6087004D7619 /* SkDrawProcs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SkDrawProcs.h; sourceTree = "<group>"; };
 		7B4DF4820E5B6087004D7619 /* SkTypeface_fake.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkTypeface_fake.cpp; sourceTree = "<group>"; };
+		A70A3BA80ED7385F00C31871 /* bitmap_platform_device_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bitmap_platform_device_mac.cc; path = ext/bitmap_platform_device_mac.cc; sourceTree = "<group>"; };
+		A70A3BA90ED7385F00C31871 /* bitmap_platform_device_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bitmap_platform_device_mac.h; path = ext/bitmap_platform_device_mac.h; sourceTree = "<group>"; };
+		A70A3BAA0ED7385F00C31871 /* platform_canvas_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = platform_canvas_mac.cc; path = ext/platform_canvas_mac.cc; sourceTree = "<group>"; };
+		A70A3BAB0ED7385F00C31871 /* platform_canvas_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform_canvas_mac.h; path = ext/platform_canvas_mac.h; sourceTree = "<group>"; };
+		A70A3BAC0ED7385F00C31871 /* platform_device_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = platform_device_mac.cc; path = ext/platform_device_mac.cc; sourceTree = "<group>"; };
+		A70A3BAD0ED7385F00C31871 /* platform_device_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform_device_mac.h; path = ext/platform_device_mac.h; sourceTree = "<group>"; };
 		AB4C45B00DAE9C3700FC0DB7 /* SkTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkTime.cpp; sourceTree = "<group>"; };
 		AB4C465C0DAE9C4A00FC0DB7 /* Sk64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Sk64.cpp; sourceTree = "<group>"; };
 		AB4C465D0DAE9C4A00FC0DB7 /* SkBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkBuffer.cpp; sourceTree = "<group>"; };
@@ -476,9 +485,23 @@
 			path = ../build;
 			sourceTree = "<group>";
 		};
+		A70A3BA70ED7385100C31871 /* ext */ = {
+			isa = PBXGroup;
+			children = (
+				A70A3BA80ED7385F00C31871 /* bitmap_platform_device_mac.cc */,
+				A70A3BA90ED7385F00C31871 /* bitmap_platform_device_mac.h */,
+				A70A3BAA0ED7385F00C31871 /* platform_canvas_mac.cc */,
+				A70A3BAB0ED7385F00C31871 /* platform_canvas_mac.h */,
+				A70A3BAC0ED7385F00C31871 /* platform_device_mac.cc */,
+				A70A3BAD0ED7385F00C31871 /* platform_device_mac.h */,
+			);
+			name = ext;
+			sourceTree = "<group>";
+		};
 		AB4C450D0DAE9B9100FC0DB7 /* Source */ = {
 			isa = PBXGroup;
 			children = (
+				A70A3BA70ED7385100C31871 /* ext */,

[Mark Mentovai, 2008/11/21 20:19:20]

ext should come after effects

 				AB4C45130DAE9C3700FC0DB7 /* animator */,
 				AB4C46580DAE9C4A00FC0DB7 /* corecg */,
 				AB4C46850DAE9C4F00FC0DB7 /* effects */,
@@ -1013,6 +1036,9 @@
 				E48EE5380E34E873009DE966 /* SkUtils.cpp in Sources */,
 				E48EE5390E34E873009DE966 /* SkWriter32.cpp in Sources */,
 				E48EE53A0E34E873009DE966 /* SkXfermode.cpp in Sources */,
+				A70A3BAE0ED7385F00C31871 /* bitmap_platform_device_mac.cc in Sources */,

[Mark Mentovai, 2008/11/21 20:19:20]

Can you move these so that the list is sorted?  (Compile Sources list in the
skia target.)

+				A70A3BAF0ED7385F00C31871 /* platform_canvas_mac.cc in Sources */,
+				A70A3BB00ED7385F00C31871 /* platform_device_mac.cc in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1024,6 +1050,7 @@
 			baseConfigurationReference = 7B4DF44A0E5B5E5C004D7619 /* debug.xcconfig */;
 			buildSettings = {
 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+				HEADER_SEARCH_PATHS = "";

[Mark Mentovai, 2008/11/21 20:19:20]

You should delete this setting entirely, not just the value you had here. 
(Click on the setting and press delete, don't just delete its content.) 
(Project-wide HEADER_SEARCH_PATHS in Debug configuration.)

 				XCODEPROJ_DEPTH = ..;
 			};
 			name = Debug;
@@ -1033,6 +1060,7 @@
 			baseConfigurationReference = 7B4DF44C0E5B5E5C004D7619 /* release.xcconfig */;
 			buildSettings = {
 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+				HEADER_SEARCH_PATHS = "";

[Mark Mentovai, 2008/11/21 20:19:20]

(same for Release)

 				XCODEPROJ_DEPTH = ..;
 			};
 			name = Release;
@@ -1041,12 +1069,14 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7B4DF44D0E5B5E5C004D7619 /* staticlib.xcconfig */;
 			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks";
 				GCC_PREFIX_HEADER = skia_Prefix.pch;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(GCC_PREPROCESSOR_DEFINITIONS)",
 					SK_BUILD_FOR_MAC,
 				);
 				HEADER_SEARCH_PATHS = (
+					..,
 					corecg,
 					include,
 					include/corecg,
@@ -1061,12 +1091,14 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7B4DF44D0E5B5E5C004D7619 /* staticlib.xcconfig */;
 			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks";
 				GCC_PREFIX_HEADER = skia_Prefix.pch;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(GCC_PREPROCESSOR_DEFINITIONS)",
 					SK_BUILD_FOR_MAC,
 				);
 				HEADER_SEARCH_PATHS = (
+					..,
 					corecg,
 					include,
 					include/corecg,