[Vm-dev] [commit][3528] Fix the signature of signed32BitValueOf to answer int.

commits at squeakvm.org commits at squeakvm.org
Mon Dec 14 19:04:55 UTC 2015 

Revision: 3528
Author:   eliot
Date:     2015-12-14 11:04:52 -0800 (Mon, 14 Dec 2015)
Log Message:
-----------
Fix the signature of signed32BitValueOf to answer int.

In the mac 64- & 32-bit Cog Spur builds:
Nuke unused prefix headers.  Replace use of Carbon with Cocoa.
Include the iOS config.h sqConfig.h & sqPlatformSpecific.h
I note that sqPlatformSpecific.h lives in iPhone but sgould be in Common
but editing so many project.pbxproj files makes this change hugely
expensive.  We should use Makefiles and discard this xcode crap.

Modified Paths:
--------------
    branches/Cog/build.macos32x86/glue.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/glue.cog.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/glue.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/glue.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/newspeak.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/newspeak.cog.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/newspeak.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/newspeak.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.cog.spur/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.cog.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.cog.v3/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.cog.v3/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.cog.v3/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.cog.v3/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.cog.v3/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.cog.v3/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.cog.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.cog.v3/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.sista.spur/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.sista.spur/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.sista.spur/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.sista.spur/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.sista.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.sista.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.sista.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.stack.spur/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.stack.spur/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.stack.spur/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.stack.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.stack.v3/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.stack.v3/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.stack.v3/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.stack.v3/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.stack.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/squeak.stack.v3/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos32x86/xcode/CarbonTemplate/Template.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/newspeak.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/newspeak.cog.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/newspeak.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/newspeak.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/squeak.cog.spur/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/squeak.cog.spur/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/squeak.cog.spur/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/squeak.cog.spur/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/squeak.cog.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/squeak.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/squeak.cog.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/squeak.cog.spur/makeiosvm
    branches/Cog/build.macos64x64/squeak.sista.spur/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/squeak.sista.spur/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/squeak.sista.spur/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/squeak.sista.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/squeak.sista.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/squeak.sista.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/squeak.stack.spur/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/squeak.stack.spur/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/squeak.stack.spur/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/squeak.stack.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/squeak.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/squeak.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/xcode/Template/Template.xcodeproj/project.pbxproj
    branches/Cog/platforms/Cross/vm/sqVirtualMachine.c
    branches/Cog/platforms/Cross/vm/sqVirtualMachine.h
    branches/Cog/platforms/iOS/plugins/SqueakSSL/sqMacSSL.c
    branches/Cog/platforms/iOS/vm/OSX/config.h

Removed Paths:
-------------
    branches/Cog/build.macos32x86/glue.cog.spur/SqueakSSL/SqueakSSL_Prefix.pch
    branches/Cog/build.macos32x86/glue.stack.spur/SqueakSSL/SqueakSSL_Prefix.pch
    branches/Cog/build.macos32x86/newspeak.cog.spur/SqueakSSL/SqueakSSL_Prefix.pch
    branches/Cog/build.macos32x86/newspeak.stack.spur/SqueakSSL/SqueakSSL_Prefix.pch
    branches/Cog/build.macos32x86/squeak.cog.spur/CroquetPlugin/CroquetPlugin_Prefix.pch
    branches/Cog/build.macos32x86/squeak.cog.v3/CroquetPlugin/CroquetPlugin_Prefix.pch
    branches/Cog/build.macos32x86/squeak.cog.v3/SqueakSSL/SqueakSSL_Prefix.pch
    branches/Cog/build.macos32x86/squeak.sista.spur/CroquetPlugin/CroquetPlugin_Prefix.pch
    branches/Cog/build.macos32x86/squeak.sista.spur/SqueakSSL/SqueakSSL_Prefix.pch
    branches/Cog/build.macos32x86/squeak.stack.spur/CroquetPlugin/CroquetPlugin_Prefix.pch
    branches/Cog/build.macos32x86/squeak.stack.spur/SqueakSSL/SqueakSSL_Prefix.pch
    branches/Cog/build.macos32x86/squeak.stack.v3/CroquetPlugin/CroquetPlugin_Prefix.pch
    branches/Cog/build.macos32x86/squeak.stack.v3/SqueakSSL/SqueakSSL_Prefix.pch
    branches/Cog/build.macos64x64/newspeak.cog.spur/SqueakSSL/SqueakSSL_Prefix.pch
    branches/Cog/build.macos64x64/newspeak.stack.spur/SqueakSSL/SqueakSSL_Prefix.pch
    branches/Cog/build.macos64x64/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj
    branches/Cog/build.macos64x64/squeak.cog.spur/CroquetPlugin/CroquetPlugin_Prefix.pch
    branches/Cog/build.macos64x64/squeak.cog.spur/SqueakSSL/SqueakSSL_Prefix.pch
    branches/Cog/build.macos64x64/squeak.sista.spur/CroquetPlugin/CroquetPlugin_Prefix.pch
    branches/Cog/build.macos64x64/squeak.sista.spur/SqueakSSL/SqueakSSL_Prefix.pch
    branches/Cog/build.macos64x64/squeak.stack.spur/CroquetPlugin/CroquetPlugin_Prefix.pch
    branches/Cog/build.macos64x64/squeak.stack.spur/SqueakSSL/SqueakSSL_Prefix.pch

Property Changed:
----------------
    branches/Cog/platforms/Cross/vm/sqSCCSVersion.h

Modified: branches/Cog/build.macos32x86/glue.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/glue.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/glue.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -205,8 +205,6 @@
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = SqueakSSL_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				PRODUCT_NAME = SqueakSSL;
@@ -220,8 +218,6 @@
 			buildSettings = {
 				ARCHS = i386;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = SqueakSSL_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				PRODUCT_NAME = SqueakSSL;
@@ -234,7 +230,7 @@
 			buildSettings = {
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				PREBINDING = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};
@@ -245,7 +241,7 @@
 			buildSettings = {
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				PREBINDING = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};

Deleted: branches/Cog/build.macos32x86/glue.cog.spur/SqueakSSL/SqueakSSL_Prefix.pch
===================================================================
--- branches/Cog/build.macos32x86/glue.cog.spur/SqueakSSL/SqueakSSL_Prefix.pch	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/glue.cog.spur/SqueakSSL/SqueakSSL_Prefix.pch	2015-12-14 19:04:52 UTC (rev 3528)
@@ -1,5 +0,0 @@
-//
-// Prefix header for all source files of the 'Template' target in the 'Template' project.
-//
-
-#include <Carbon/Carbon.h>

Modified: branches/Cog/build.macos32x86/glue.cog.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/glue.cog.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/glue.cog.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -210,7 +210,7 @@
 				);
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				PRODUCT_NAME = UnixOSProcessPlugin;
-				USER_HEADER_SEARCH_PATHS = "/Developer/Headers/FlatCarbon \"$(SRCROOT)/../../../../../platforms/Mac OS/vm\" \"$(SRCROOT)/../../../vm\" \"$(SRCROOT)/../../vm\" \"$(SRCROOT)/../../../../Cross/vm\" \"$(SRCROOT)/../../../../Cross/plugins/FilePlugin\" \"$(SRCROOT)/../../../../Cross/plugins/SocketPlugin\" $(inherited)";
+				USER_HEADER_SEARCH_PATHS = "/Developer/Headers/FlatCocoa \"$(SRCROOT)/../../../../../platforms/Mac OS/vm\" \"$(SRCROOT)/../../../vm\" \"$(SRCROOT)/../../vm\" \"$(SRCROOT)/../../../../Cross/vm\" \"$(SRCROOT)/../../../../Cross/plugins/FilePlugin\" \"$(SRCROOT)/../../../../Cross/plugins/SocketPlugin\" $(inherited)";
 				WRAPPER_EXTENSION = bundle;
 				ZERO_LINK = YES;
 			};
@@ -238,7 +238,7 @@
 				);
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				PRODUCT_NAME = UnixOSProcessPlugin;
-				USER_HEADER_SEARCH_PATHS = "/Developer/Headers/FlatCarbon \"$(SRCROOT)/../../../../../platforms/Mac OS/vm\" \"$(SRCROOT)/../../../vm\" \"$(SRCROOT)/../../vm\" \"$(SRCROOT)/../../../../Cross/vm\" \"$(SRCROOT)/../../../../Cross/plugins/FilePlugin\" \"$(SRCROOT)/../../../../Cross/plugins/SocketPlugin\" $(inherited)";
+				USER_HEADER_SEARCH_PATHS = "/Developer/Headers/FlatCocoa \"$(SRCROOT)/../../../../../platforms/Mac OS/vm\" \"$(SRCROOT)/../../../vm\" \"$(SRCROOT)/../../vm\" \"$(SRCROOT)/../../../../Cross/vm\" \"$(SRCROOT)/../../../../Cross/plugins/FilePlugin\" \"$(SRCROOT)/../../../../Cross/plugins/SocketPlugin\" $(inherited)";
 				WRAPPER_EXTENSION = bundle;
 			};
 			name = Release;

Modified: branches/Cog/build.macos32x86/glue.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/glue.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/glue.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -205,8 +205,6 @@
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = SqueakSSL_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				PRODUCT_NAME = SqueakSSL;
@@ -220,8 +218,6 @@
 			buildSettings = {
 				ARCHS = i386;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = SqueakSSL_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				PRODUCT_NAME = SqueakSSL;
@@ -234,7 +230,7 @@
 			buildSettings = {
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				PREBINDING = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};
@@ -245,7 +241,7 @@
 			buildSettings = {
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				PREBINDING = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};

Deleted: branches/Cog/build.macos32x86/glue.stack.spur/SqueakSSL/SqueakSSL_Prefix.pch
===================================================================
--- branches/Cog/build.macos32x86/glue.stack.spur/SqueakSSL/SqueakSSL_Prefix.pch	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/glue.stack.spur/SqueakSSL/SqueakSSL_Prefix.pch	2015-12-14 19:04:52 UTC (rev 3528)
@@ -1,5 +0,0 @@
-//
-// Prefix header for all source files of the 'Template' target in the 'Template' project.
-//
-
-#include <Carbon/Carbon.h>

Modified: branches/Cog/build.macos32x86/glue.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/glue.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/glue.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -210,7 +210,7 @@
 				);
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				PRODUCT_NAME = UnixOSProcessPlugin;
-				USER_HEADER_SEARCH_PATHS = "/Developer/Headers/FlatCarbon \"$(SRCROOT)/../../../../../platforms/Mac OS/vm\" \"$(SRCROOT)/../../../vm\" \"$(SRCROOT)/../../vm\" \"$(SRCROOT)/../../../../Cross/vm\" \"$(SRCROOT)/../../../../Cross/plugins/FilePlugin\" \"$(SRCROOT)/../../../../Cross/plugins/SocketPlugin\" $(inherited)";
+				USER_HEADER_SEARCH_PATHS = "/Developer/Headers/FlatCocoa \"$(SRCROOT)/../../../../../platforms/Mac OS/vm\" \"$(SRCROOT)/../../../vm\" \"$(SRCROOT)/../../vm\" \"$(SRCROOT)/../../../../Cross/vm\" \"$(SRCROOT)/../../../../Cross/plugins/FilePlugin\" \"$(SRCROOT)/../../../../Cross/plugins/SocketPlugin\" $(inherited)";
 				WRAPPER_EXTENSION = bundle;
 				ZERO_LINK = YES;
 			};
@@ -238,7 +238,7 @@
 				);
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				PRODUCT_NAME = UnixOSProcessPlugin;
-				USER_HEADER_SEARCH_PATHS = "/Developer/Headers/FlatCarbon \"$(SRCROOT)/../../../../../platforms/Mac OS/vm\" \"$(SRCROOT)/../../../vm\" \"$(SRCROOT)/../../vm\" \"$(SRCROOT)/../../../../Cross/vm\" \"$(SRCROOT)/../../../../Cross/plugins/FilePlugin\" \"$(SRCROOT)/../../../../Cross/plugins/SocketPlugin\" $(inherited)";
+				USER_HEADER_SEARCH_PATHS = "/Developer/Headers/FlatCocoa \"$(SRCROOT)/../../../../../platforms/Mac OS/vm\" \"$(SRCROOT)/../../../vm\" \"$(SRCROOT)/../../vm\" \"$(SRCROOT)/../../../../Cross/vm\" \"$(SRCROOT)/../../../../Cross/plugins/FilePlugin\" \"$(SRCROOT)/../../../../Cross/plugins/SocketPlugin\" $(inherited)";
 				WRAPPER_EXTENSION = bundle;
 			};
 			name = Release;

Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -205,8 +205,6 @@
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = SqueakSSL_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				PRODUCT_NAME = SqueakSSL;
@@ -220,8 +218,6 @@
 			buildSettings = {
 				ARCHS = i386;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = SqueakSSL_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				PRODUCT_NAME = SqueakSSL;
@@ -234,7 +230,7 @@
 			buildSettings = {
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				PREBINDING = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};
@@ -245,7 +241,7 @@
 			buildSettings = {
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				PREBINDING = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};

Deleted: branches/Cog/build.macos32x86/newspeak.cog.spur/SqueakSSL/SqueakSSL_Prefix.pch
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/SqueakSSL/SqueakSSL_Prefix.pch	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/SqueakSSL/SqueakSSL_Prefix.pch	2015-12-14 19:04:52 UTC (rev 3528)
@@ -1,5 +0,0 @@
-//
-// Prefix header for all source files of the 'Template' target in the 'Template' project.
-//
-
-#include <Carbon/Carbon.h>

Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -210,7 +210,7 @@
 				);
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				PRODUCT_NAME = UnixOSProcessPlugin;
-				USER_HEADER_SEARCH_PATHS = "/Developer/Headers/FlatCarbon \"$(SRCROOT)/../../../../../platforms/Mac OS/vm\" \"$(SRCROOT)/../../../vm\" \"$(SRCROOT)/../../vm\" \"$(SRCROOT)/../../../../Cross/vm\" \"$(SRCROOT)/../../../../Cross/plugins/FilePlugin\" \"$(SRCROOT)/../../../../Cross/plugins/SocketPlugin\" $(inherited)";
+				USER_HEADER_SEARCH_PATHS = "/Developer/Headers/FlatCocoa \"$(SRCROOT)/../../../../../platforms/Mac OS/vm\" \"$(SRCROOT)/../../../vm\" \"$(SRCROOT)/../../vm\" \"$(SRCROOT)/../../../../Cross/vm\" \"$(SRCROOT)/../../../../Cross/plugins/FilePlugin\" \"$(SRCROOT)/../../../../Cross/plugins/SocketPlugin\" $(inherited)";
 				WRAPPER_EXTENSION = bundle;
 				ZERO_LINK = YES;
 			};
@@ -238,7 +238,7 @@
 				);
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				PRODUCT_NAME = UnixOSProcessPlugin;
-				USER_HEADER_SEARCH_PATHS = "/Developer/Headers/FlatCarbon \"$(SRCROOT)/../../../../../platforms/Mac OS/vm\" \"$(SRCROOT)/../../../vm\" \"$(SRCROOT)/../../vm\" \"$(SRCROOT)/../../../../Cross/vm\" \"$(SRCROOT)/../../../../Cross/plugins/FilePlugin\" \"$(SRCROOT)/../../../../Cross/plugins/SocketPlugin\" $(inherited)";
+				USER_HEADER_SEARCH_PATHS = "/Developer/Headers/FlatCocoa \"$(SRCROOT)/../../../../../platforms/Mac OS/vm\" \"$(SRCROOT)/../../../vm\" \"$(SRCROOT)/../../vm\" \"$(SRCROOT)/../../../../Cross/vm\" \"$(SRCROOT)/../../../../Cross/plugins/FilePlugin\" \"$(SRCROOT)/../../../../Cross/plugins/SocketPlugin\" $(inherited)";
 				WRAPPER_EXTENSION = bundle;
 			};
 			name = Release;

Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/newspeak.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/newspeak.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -205,8 +205,6 @@
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = SqueakSSL_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				PRODUCT_NAME = SqueakSSL;
@@ -220,8 +218,6 @@
 			buildSettings = {
 				ARCHS = i386;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = SqueakSSL_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				PRODUCT_NAME = SqueakSSL;
@@ -234,7 +230,7 @@
 			buildSettings = {
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				PREBINDING = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};
@@ -245,7 +241,7 @@
 			buildSettings = {
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				PREBINDING = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};

Deleted: branches/Cog/build.macos32x86/newspeak.stack.spur/SqueakSSL/SqueakSSL_Prefix.pch
===================================================================
--- branches/Cog/build.macos32x86/newspeak.stack.spur/SqueakSSL/SqueakSSL_Prefix.pch	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/newspeak.stack.spur/SqueakSSL/SqueakSSL_Prefix.pch	2015-12-14 19:04:52 UTC (rev 3528)
@@ -1,5 +0,0 @@
-//
-// Prefix header for all source files of the 'Template' target in the 'Template' project.
-//
-
-#include <Carbon/Carbon.h>

Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/newspeak.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/newspeak.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -210,7 +210,7 @@
 				);
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				PRODUCT_NAME = UnixOSProcessPlugin;
-				USER_HEADER_SEARCH_PATHS = "/Developer/Headers/FlatCarbon \"$(SRCROOT)/../../../../../platforms/Mac OS/vm\" \"$(SRCROOT)/../../../vm\" \"$(SRCROOT)/../../vm\" \"$(SRCROOT)/../../../../Cross/vm\" \"$(SRCROOT)/../../../../Cross/plugins/FilePlugin\" \"$(SRCROOT)/../../../../Cross/plugins/SocketPlugin\" $(inherited)";
+				USER_HEADER_SEARCH_PATHS = "/Developer/Headers/FlatCocoa \"$(SRCROOT)/../../../../../platforms/Mac OS/vm\" \"$(SRCROOT)/../../../vm\" \"$(SRCROOT)/../../vm\" \"$(SRCROOT)/../../../../Cross/vm\" \"$(SRCROOT)/../../../../Cross/plugins/FilePlugin\" \"$(SRCROOT)/../../../../Cross/plugins/SocketPlugin\" $(inherited)";
 				WRAPPER_EXTENSION = bundle;
 				ZERO_LINK = YES;
 			};
@@ -238,7 +238,7 @@
 				);
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				PRODUCT_NAME = UnixOSProcessPlugin;
-				USER_HEADER_SEARCH_PATHS = "/Developer/Headers/FlatCarbon \"$(SRCROOT)/../../../../../platforms/Mac OS/vm\" \"$(SRCROOT)/../../../vm\" \"$(SRCROOT)/../../vm\" \"$(SRCROOT)/../../../../Cross/vm\" \"$(SRCROOT)/../../../../Cross/plugins/FilePlugin\" \"$(SRCROOT)/../../../../Cross/plugins/SocketPlugin\" $(inherited)";
+				USER_HEADER_SEARCH_PATHS = "/Developer/Headers/FlatCocoa \"$(SRCROOT)/../../../../../platforms/Mac OS/vm\" \"$(SRCROOT)/../../../vm\" \"$(SRCROOT)/../../vm\" \"$(SRCROOT)/../../../../Cross/vm\" \"$(SRCROOT)/../../../../Cross/plugins/FilePlugin\" \"$(SRCROOT)/../../../../Cross/plugins/SocketPlugin\" $(inherited)";
 				WRAPPER_EXTENSION = bundle;
 			};
 			name = Release;

Modified: branches/Cog/build.macos32x86/squeak.cog.spur/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -203,8 +203,6 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = CroquetPlugin_Prefix.pch;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					_XOPEN_SOURCE,
 					HAVE_SYS_TIME_H,
@@ -225,8 +223,6 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_MODEL_TUNING = G4;
 				GCC_OPTIMIZATION_LEVEL = s;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_PREFIX_HEADER = CroquetPlugin_Prefix.pch;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					_XOPEN_SOURCE,
 					HAVE_SYS_TIME_H,

Deleted: branches/Cog/build.macos32x86/squeak.cog.spur/CroquetPlugin/CroquetPlugin_Prefix.pch
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/CroquetPlugin/CroquetPlugin_Prefix.pch	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/CroquetPlugin/CroquetPlugin_Prefix.pch	2015-12-14 19:04:52 UTC (rev 3528)
@@ -1,2 +0,0 @@
-
-/* Empty */

Modified: branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -250,7 +250,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				PREBINDING = NO;
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
@@ -273,7 +273,7 @@
 				GCC_MODEL_TUNING = "";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				PREBINDING = NO;
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;

Modified: branches/Cog/build.macos32x86/squeak.cog.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		949199FD098186FB000FC37A /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66DF6C8201D7DF7E00A80119 /* Carbon.framework */; };
+		949199FD098186FB000FC37A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66DF6C8201D7DF7E00A80119 /* Cocoa.framework */; };
 		94C941F71BBB2384005D3CFF /* dct.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181BC910814EC700B8FC7A /* dct.c */; };
 		A2181C0F10814EC700B8FC7A /* header.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181BCA10814EC700B8FC7A /* header.c */; };
 		A2181C1010814EC700B8FC7A /* layer1.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181BCC10814EC700B8FC7A /* layer1.c */; };
@@ -41,7 +41,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		66DF6C8201D7DF7E00A80119 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
+		66DF6C8201D7DF7E00A80119 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		949199E209818612000FC37A /* Mpeg3Plugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Mpeg3Plugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		A2181BBF10814E0B00B8FC7A /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; };
 		A2181BC010814E0B00B8FC7A /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; };
@@ -110,7 +110,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				949199FD098186FB000FC37A /* Carbon.framework in Frameworks */,
+				949199FD098186FB000FC37A /* Cocoa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -122,7 +122,7 @@
 			children = (
 				66DF6BFF01D7DCEA00A80119 /* Sources */,
 				66DF6C3901D7DCEA00A80119 /* resources */,
-				66DF6C8201D7DF7E00A80119 /* Carbon.framework */,
+				66DF6C8201D7DF7E00A80119 /* Cocoa.framework */,
 				66DF6C4501D7DEEE00A80119 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -378,7 +378,6 @@
 				COMBINE_HIDPI_IMAGES = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				INFOPLIST_FILE = "Mpeg3Plugin-Info.plist";
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				OTHER_CFLAGS = "-DNOPTHREADS";
@@ -397,7 +396,6 @@
 				GCC_ENABLE_CPP_RTTI = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_UNROLL_LOOPS = YES;
 				INFOPLIST_FILE = "Mpeg3Plugin-Info.plist";
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
@@ -414,7 +412,6 @@
 			buildSettings = {
 				COMBINE_HIDPI_IMAGES = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				INFOPLIST_FILE = "Mpeg3Plugin-Info.plist";
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				PRODUCT_BUNDLE_IDENTIFIER = org.squeak.Mpeg3Plugin;

Modified: branches/Cog/build.macos32x86/squeak.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -207,8 +207,6 @@
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				PRODUCT_BUNDLE_IDENTIFIER = org.squeak.Cog.SqueakSSL;
 				PRODUCT_NAME = SqueakSSL;
@@ -222,8 +220,6 @@
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				PRODUCT_BUNDLE_IDENTIFIER = org.squeak.Cog.SqueakSSL;
 				PRODUCT_NAME = SqueakSSL;

Modified: branches/Cog/build.macos32x86/squeak.cog.v3/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.v3/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.cog.v3/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -221,7 +221,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				PREBINDING = NO;
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
@@ -241,7 +241,7 @@
 				GCC_MODEL_TUNING = "";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				PREBINDING = NO;
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;

Modified: branches/Cog/build.macos32x86/squeak.cog.v3/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.v3/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.cog.v3/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -197,8 +197,6 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = CroquetPlugin_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				PRODUCT_NAME = CroquetPlugin;
@@ -214,8 +212,6 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_MODEL_TUNING = G4;
 				GCC_OPTIMIZATION_LEVEL = s;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_PREFIX_HEADER = CroquetPlugin_Prefix.pch;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					_XOPEN_SOURCE,
 					HAVE_SYS_TIME_H,
@@ -270,7 +266,7 @@
 				GCC_VERSION = 4.2;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				ICC_FP_MODEL = source;
 				ICC_FP_SPECULATION = off;
 				ICC_OPTLEVEL = speedHLO;

Deleted: branches/Cog/build.macos32x86/squeak.cog.v3/CroquetPlugin/CroquetPlugin_Prefix.pch
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.v3/CroquetPlugin/CroquetPlugin_Prefix.pch	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.cog.v3/CroquetPlugin/CroquetPlugin_Prefix.pch	2015-12-14 19:04:52 UTC (rev 3528)
@@ -1,2 +0,0 @@
-
-/* Empty */

Modified: branches/Cog/build.macos32x86/squeak.cog.v3/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.v3/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.cog.v3/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -247,7 +247,7 @@
 				GCC_VERSION = 4.2;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				ICC_FP_MODEL = source;
 				ICC_FP_SPECULATION = off;
 				ICC_OPTLEVEL = speedHLO;

Modified: branches/Cog/build.macos32x86/squeak.cog.v3/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.v3/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.cog.v3/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -432,7 +432,7 @@
 				GCC_VERSION = 4.2;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				ICC_FP_MODEL = source;
 				ICC_FP_SPECULATION = off;
 				ICC_OPTLEVEL = speedHLO;

Modified: branches/Cog/build.macos32x86/squeak.cog.v3/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.v3/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.cog.v3/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -244,7 +244,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				PREBINDING = NO;
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.6.sdk;
@@ -264,7 +264,7 @@
 				GCC_MODEL_TUNING = "";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				PREBINDING = NO;
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.6.sdk;

Modified: branches/Cog/build.macos32x86/squeak.cog.v3/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.v3/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.cog.v3/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		949199FD098186FB000FC37A /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66DF6C8201D7DF7E00A80119 /* Carbon.framework */; };
+		949199FD098186FB000FC37A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66DF6C8201D7DF7E00A80119 /* Cocoa.framework */; };
 		A2181C0E10814EC700B8FC7A /* dct.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181BC910814EC700B8FC7A /* dct.c */; };
 		A2181C0F10814EC700B8FC7A /* header.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181BCA10814EC700B8FC7A /* header.c */; };
 		A2181C1010814EC700B8FC7A /* layer1.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181BCC10814EC700B8FC7A /* layer1.c */; };
@@ -41,7 +41,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		66DF6C8201D7DF7E00A80119 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
+		66DF6C8201D7DF7E00A80119 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		949199E209818612000FC37A /* Mpeg3Plugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Mpeg3Plugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		A2181BBF10814E0B00B8FC7A /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; };
 		A2181BC010814E0B00B8FC7A /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; };
@@ -110,7 +110,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				949199FD098186FB000FC37A /* Carbon.framework in Frameworks */,
+				949199FD098186FB000FC37A /* Cocoa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -122,7 +122,7 @@
 			children = (
 				66DF6BFF01D7DCEA00A80119 /* Sources */,
 				66DF6C3901D7DCEA00A80119 /* resources */,
-				66DF6C8201D7DF7E00A80119 /* Carbon.framework */,
+				66DF6C8201D7DF7E00A80119 /* Cocoa.framework */,
 				66DF6C4501D7DEEE00A80119 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -361,19 +361,13 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_MODEL_TUNING = "";
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				INFOPLIST_FILE = "Mpeg3Plugin-Info.plist";
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				OTHER_CFLAGS = (
 					"-fPIC",
 					"-DNOPTHREADS",
 				);
-				OTHER_LDFLAGS = (
-					"-framework",
-					Carbon,
-				);
 				PKGINFO_FILE_CONTENTS = BNDLFAST;
 				PREBINDING = NO;
 				PRODUCT_NAME = Mpeg3Plugin;
@@ -391,17 +385,11 @@
 				GCC_ENABLE_CPP_RTTI = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
 				GCC_UNROLL_LOOPS = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				INFOPLIST_FILE = "Mpeg3Plugin-Info.plist";
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				OTHER_CFLAGS = "-DNOPTHREADS";
-				OTHER_LDFLAGS = (
-					"-framework",
-					Carbon,
-				);
 				PREBINDING = NO;
 				PRODUCT_NAME = Mpeg3Plugin;
 				USER_HEADER_SEARCH_PATHS = "../../../platforms/Cross/plugins/Mpeg3Plugin/libmpeg/**";
@@ -413,14 +401,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
 				INFOPLIST_FILE = "Mpeg3Plugin-Info.plist";
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
-				OTHER_LDFLAGS = (
-					"-framework",
-					Carbon,
-				);
 				PREBINDING = NO;
 				PRODUCT_NAME = Mpeg3Plugin;
 				WRAPPER_EXTENSION = bundle;

Modified: branches/Cog/build.macos32x86/squeak.cog.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.cog.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -205,8 +205,6 @@
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = SqueakSSL_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				PRODUCT_NAME = SqueakSSL;
@@ -220,8 +218,6 @@
 			buildSettings = {
 				ARCHS = i386;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = SqueakSSL_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				PRODUCT_NAME = SqueakSSL;
@@ -234,7 +230,7 @@
 			buildSettings = {
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				PREBINDING = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};
@@ -245,7 +241,7 @@
 			buildSettings = {
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				PREBINDING = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};

Deleted: branches/Cog/build.macos32x86/squeak.cog.v3/SqueakSSL/SqueakSSL_Prefix.pch
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.v3/SqueakSSL/SqueakSSL_Prefix.pch	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.cog.v3/SqueakSSL/SqueakSSL_Prefix.pch	2015-12-14 19:04:52 UTC (rev 3528)
@@ -1,5 +0,0 @@
-//
-// Prefix header for all source files of the 'Template' target in the 'Template' project.
-//
-
-#include <Carbon/Carbon.h>

Modified: branches/Cog/build.macos32x86/squeak.cog.v3/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.v3/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.cog.v3/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -210,7 +210,7 @@
 				);
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				PRODUCT_NAME = UnixOSProcessPlugin;
-				USER_HEADER_SEARCH_PATHS = "/Developer/Headers/FlatCarbon \"$(SRCROOT)/../../../../../platforms/Mac OS/vm\" \"$(SRCROOT)/../../../vm\" \"$(SRCROOT)/../../vm\" \"$(SRCROOT)/../../../../Cross/vm\" \"$(SRCROOT)/../../../../Cross/plugins/FilePlugin\" \"$(SRCROOT)/../../../../Cross/plugins/SocketPlugin\" $(inherited)";
+				USER_HEADER_SEARCH_PATHS = "/Developer/Headers/FlatCocoa \"$(SRCROOT)/../../../../../platforms/Mac OS/vm\" \"$(SRCROOT)/../../../vm\" \"$(SRCROOT)/../../vm\" \"$(SRCROOT)/../../../../Cross/vm\" \"$(SRCROOT)/../../../../Cross/plugins/FilePlugin\" \"$(SRCROOT)/../../../../Cross/plugins/SocketPlugin\" $(inherited)";
 				WRAPPER_EXTENSION = bundle;
 				ZERO_LINK = YES;
 			};
@@ -238,7 +238,7 @@
 				);
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				PRODUCT_NAME = UnixOSProcessPlugin;
-				USER_HEADER_SEARCH_PATHS = "/Developer/Headers/FlatCarbon \"$(SRCROOT)/../../../../../platforms/Mac OS/vm\" \"$(SRCROOT)/../../../vm\" \"$(SRCROOT)/../../vm\" \"$(SRCROOT)/../../../../Cross/vm\" \"$(SRCROOT)/../../../../Cross/plugins/FilePlugin\" \"$(SRCROOT)/../../../../Cross/plugins/SocketPlugin\" $(inherited)";
+				USER_HEADER_SEARCH_PATHS = "/Developer/Headers/FlatCocoa \"$(SRCROOT)/../../../../../platforms/Mac OS/vm\" \"$(SRCROOT)/../../../vm\" \"$(SRCROOT)/../../vm\" \"$(SRCROOT)/../../../../Cross/vm\" \"$(SRCROOT)/../../../../Cross/plugins/FilePlugin\" \"$(SRCROOT)/../../../../Cross/plugins/SocketPlugin\" $(inherited)";
 				WRAPPER_EXTENSION = bundle;
 			};
 			name = Release;

Modified: branches/Cog/build.macos32x86/squeak.sista.spur/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -221,7 +221,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				PREBINDING = NO;
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
@@ -241,7 +241,7 @@
 				GCC_MODEL_TUNING = "";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				PREBINDING = NO;
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;

Modified: branches/Cog/build.macos32x86/squeak.sista.spur/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -197,8 +197,6 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = CroquetPlugin_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				PRODUCT_NAME = CroquetPlugin;
@@ -214,8 +212,6 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_MODEL_TUNING = G4;
 				GCC_OPTIMIZATION_LEVEL = s;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_PREFIX_HEADER = CroquetPlugin_Prefix.pch;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					_XOPEN_SOURCE,
 					HAVE_SYS_TIME_H,
@@ -270,7 +266,7 @@
 				GCC_VERSION = 4.2;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				ICC_FP_MODEL = source;
 				ICC_FP_SPECULATION = off;
 				ICC_OPTLEVEL = speedHLO;

Deleted: branches/Cog/build.macos32x86/squeak.sista.spur/CroquetPlugin/CroquetPlugin_Prefix.pch
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/CroquetPlugin/CroquetPlugin_Prefix.pch	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/CroquetPlugin/CroquetPlugin_Prefix.pch	2015-12-14 19:04:52 UTC (rev 3528)
@@ -1,2 +0,0 @@
-
-/* Empty */

Modified: branches/Cog/build.macos32x86/squeak.sista.spur/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -247,7 +247,7 @@
 				GCC_VERSION = 4.2;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				ICC_FP_MODEL = source;
 				ICC_FP_SPECULATION = off;
 				ICC_OPTLEVEL = speedHLO;

Modified: branches/Cog/build.macos32x86/squeak.sista.spur/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -432,7 +432,7 @@
 				GCC_VERSION = 4.2;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				ICC_FP_MODEL = source;
 				ICC_FP_SPECULATION = off;
 				ICC_OPTLEVEL = speedHLO;

Modified: branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -244,7 +244,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				PREBINDING = NO;
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.6.sdk;
@@ -264,7 +264,7 @@
 				GCC_MODEL_TUNING = "";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				PREBINDING = NO;
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.6.sdk;

Modified: branches/Cog/build.macos32x86/squeak.sista.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj	2015-12-14 02:02:24 UTC (rev 3527)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj	2015-12-14 19:04:52 UTC (rev 3528)
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		949199FD098186FB000FC37A /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66DF6C8201D7DF7E00A80119 /* Carbon.framework */; };
+		949199FD098186FB000FC37A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66DF6C8201D7DF7E00A80119 /* Cocoa.framework */; };
 		A2181C0E10814EC700B8FC7A /* dct.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181BC910814EC700B8FC7A /* dct.c */; };
 		A2181C0F10814EC700B8FC7A /* header.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181BCA10814EC700B8FC7A /* header.c */; };
 		A2181C1010814EC700B8FC7A /* layer1.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181BCC10814EC700B8FC7A /* layer1.c */; };
@@ -41,7 +41,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		66DF6C8201D7DF7E00A80119 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
+		66DF6C8201D7DF7E00A80119 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		949199E209818612000FC37A /* Mpeg3Plugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Mpeg3Plugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		A2181BBF10814E0B00B8FC7A /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; };
 		A2181BC010814E0B00B8FC7A /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; };
@@ -110,7 +110,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				949199FD098186FB000FC37A /* Carbon.framework in Frameworks */,
+				949199FD098186FB000FC37A /* Cocoa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -122,7 +122,7 @@
 			children = (
 				66DF6BFF01D7DCEA00A80119 /* Sources */,
 				66DF6C3901D7DCEA00A80119 /* resources */,
-				66DF6C8201D7DF7E00A80119 /* Carbon.framework */,
+				66DF6C8201D7DF7E00A80119 /* Cocoa.framework */,
 				66DF6C4501D7DEEE00A80119 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -361,19 +361,13 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_MODEL_TUNING = "";
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				INFOPLIST_FILE = "Mpeg3Plugin-Info.plist";
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				OTHER_CFLAGS = (
 					"-fPIC",
 					"-DNOPTHREADS",
 				);
-				OTHER_LDFLAGS = (
-					"-framework",
-					Carbon,
-				);
 				PKGINFO_FILE_CONTENTS = BNDLFAST;
 				PREBINDING = NO;
 				PRODUCT_NAME = Mpeg3Plugin;
@@ -391,17 +385,11 @@
 				GCC_ENABLE_CPP_RTTI = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
 				GCC_UNROLL_LOOPS = YES;
-				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
 				INFOPLIST_FILE = "Mpeg3Plugin-Info.plist";
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				OTHER_CFLAGS = "-DNOPTHREADS";
-				OTHER_LDFLAGS = (
-					"-framework",
-					Carbon,
-				);
 				PREBINDING = NO;
 				PRODUCT_NAME = Mpeg3Plugin;
 				USER_HEADER_SEARCH_PATHS = "../../../platforms/Cross/plugins/Mpeg3Plugin/libmpeg/**";
@@ -413,14 +401,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;

@@ Diff output truncated at 50000 characters. @@

More information about the Vm-dev mailing list