[Vm-dev] [commit][2884] Add the ImmX11Plugin (but not to builds; IMO this needs plumbing through the

commits at squeakvm.org commits at squeakvm.org
Wed Mar 26 01:03:04 UTC 2014


Revision: 2884
Author:   eliot
Date:     2014-03-25 18:03:02 -0700 (Tue, 25 Mar 2014)
Log Message:
-----------
Add the ImmX11Plugin (but not to builds; IMO this needs plumbing through the
SqDisplay.h struct).
Correct include path for interp.h for Spur external plugin builds on mac.

Modified Paths:
--------------
    branches/Cog/nsspurcogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
    branches/Cog/spurcogbuild/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj
    branches/Cog/spurcogbuild/macbuild/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj
    branches/Cog/spurcogbuild/macbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj
    branches/Cog/spurcogbuild/macbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj
    branches/Cog/spurcogbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
    branches/Cog/spurcogbuild/macbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/project.pbxproj
    branches/Cog/spurcogbuild/macbuild/SqueakMTFFIPrims/SqueakFFI.xcodeproj/project.pbxproj
    branches/Cog/spurcogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
    branches/Cog/spurcogbuild/macbuild/Template/Template.xcodeproj/project.pbxproj
    branches/Cog/spurcogbuild/macbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
    branches/Cog/spurstackbuild/macbuild/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj
    branches/Cog/spurstackbuild/macbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj
    branches/Cog/spurstackbuild/macbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj
    branches/Cog/spurstackbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
    branches/Cog/spurstackbuild/macbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/project.pbxproj
    branches/Cog/spurstackbuild/macbuild/Template/Template.xcodeproj/project.pbxproj
    branches/Cog/spurstackbuild/macbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj

Added Paths:
-----------
    branches/Cog/src/plugins/ImmX11Plugin/
    branches/Cog/src/plugins/ImmX11Plugin/ImmX11Plugin.c

Modified: branches/Cog/nsspurcogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/nsspurcogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj	2014-03-25 00:48:45 UTC (rev 2883)
+++ branches/Cog/nsspurcogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj	2014-03-26 01:03:02 UTC (rev 2884)
@@ -23,7 +23,7 @@
 		73D8A6411701272700C66275 /* sqMacSSL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqMacSSL.c; path = "../../../platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c"; sourceTree = SOURCE_ROOT; };
 		8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8D01CCD20486CAD60068D4B7 /* SqueakSSL.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SqueakSSL.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
-		DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../src/vm/interp.h; sourceTree = SOURCE_ROOT; };
+		DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../nsspursrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
 		DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; };
 		DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; };
 		DA3A20F80AA63D000050B983 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; };

Modified: branches/Cog/spurcogbuild/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/spurcogbuild/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj	2014-03-25 00:48:45 UTC (rev 2883)
+++ branches/Cog/spurcogbuild/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj	2014-03-26 01:03:02 UTC (rev 2884)
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		73020E8D0EE714E60021D217 /* BochsIA32Plugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 73020E8C0EE714E60021D217 /* BochsIA32Plugin.c */; settings = {COMPILER_FLAGS = "-I../../../platforms/Cross/vm -I../../../platforms/Cross/plugins/BochsIA32Plugin -I\"../../../platforms/Mac OS/vm\" -I../../../src/vm"; }; };
+		73020E8D0EE714E60021D217 /* BochsIA32Plugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 73020E8C0EE714E60021D217 /* BochsIA32Plugin.c */; settings = {COMPILER_FLAGS = "-I../../../platforms/Cross/vm -I../../../platforms/Cross/plugins/BochsIA32Plugin -I\"../../../platforms/Mac OS/vm\" -I../../../spursrc/vm"; }; };
 		737482B30EE7339F004E10F8 /* libcpu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B20EE7339F004E10F8 /* libcpu.a */; };
 		737482B50EE733BD004E10F8 /* libfpu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B40EE733BD004E10F8 /* libfpu.a */; };
 		737482B70EE7343B004E10F8 /* sqBochsIA32Plugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 737482B60EE7343B004E10F8 /* sqBochsIA32Plugin.cpp */; settings = {COMPILER_FLAGS = "-I../../../processors/IA32/macbochs -I../../../processors/IA32/bochs -I../../../processors/IA32/bochs/instrument/stubs"; }; };
@@ -25,7 +25,7 @@
 		737483070EE7406A004E10F8 /* libdisasm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdisasm.a; path = ../../../processors/IA32/macbochs/disasm/libdisasm.a; sourceTree = SOURCE_ROOT; };
 		8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8D01CCD20486CAD60068D4B7 /* BochsIA32Plugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BochsIA32Plugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
-		DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../src/vm/interp.h; sourceTree = SOURCE_ROOT; };
+		DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spursrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
 		DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; };
 		DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; };
 		DA3A20F80AA63D000050B983 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; };

Modified: branches/Cog/spurcogbuild/macbuild/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/spurcogbuild/macbuild/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj	2014-03-25 00:48:45 UTC (rev 2883)
+++ branches/Cog/spurcogbuild/macbuild/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj	2014-03-26 01:03:02 UTC (rev 2884)
@@ -28,7 +28,7 @@
 		08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
 		8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8D01CCD20486CAD60068D4B7 /* CroquetPlugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CroquetPlugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
-		A271C7DD0CEB874D0014AC5E /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../stacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
+		A271C7DD0CEB874D0014AC5E /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spursrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
 		A271C7DE0CEB878E0014AC5E /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; };
 		A271C7DF0CEB878E0014AC5E /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; };
 		A271C7E00CEB87BE0014AC5E /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; };

Modified: branches/Cog/spurcogbuild/macbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/spurcogbuild/macbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj	2014-03-25 00:48:45 UTC (rev 2883)
+++ branches/Cog/spurcogbuild/macbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj	2014-03-26 01:03:02 UTC (rev 2884)
@@ -26,7 +26,7 @@
 		08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
 		8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8D01CCD20486CAD60068D4B7 /* FloatArrayPlugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FloatArrayPlugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
-		A271C7DD0CEB874D0014AC5E /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../stacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
+		A271C7DD0CEB874D0014AC5E /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spursrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
 		A271C7DE0CEB878E0014AC5E /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; };
 		A271C7DF0CEB878E0014AC5E /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; };
 		A271C7E00CEB87BE0014AC5E /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; };

Modified: branches/Cog/spurcogbuild/macbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/spurcogbuild/macbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj	2014-03-25 00:48:45 UTC (rev 2883)
+++ branches/Cog/spurcogbuild/macbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj	2014-03-26 01:03:02 UTC (rev 2884)
@@ -60,7 +60,7 @@
 		08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
 		8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8D01CCD20486CAD60068D4B7 /* FloatMathPlugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FloatMathPlugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
-		A271C7DD0CEB874D0014AC5E /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../stacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
+		A271C7DD0CEB874D0014AC5E /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spursrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
 		A271C7DE0CEB878E0014AC5E /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; };
 		A271C7DF0CEB878E0014AC5E /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; };
 		A271C7E00CEB87BE0014AC5E /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; };

Modified: branches/Cog/spurcogbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/spurcogbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj	2014-03-25 00:48:45 UTC (rev 2883)
+++ branches/Cog/spurcogbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj	2014-03-26 01:03:02 UTC (rev 2884)
@@ -47,7 +47,7 @@
 		A2181BC010814E0B00B8FC7A /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; };
 		A2181BC210814E4E00B8FC7A /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqConfig.h; path = "../../../platforms/Mac OS/vm/sqConfig.h"; sourceTree = SOURCE_ROOT; };
 		A2181BC310814E4E00B8FC7A /* sqPlatformSpecific.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqPlatformSpecific.h; path = "../../../platforms/Mac OS/vm/sqPlatformSpecific.h"; sourceTree = SOURCE_ROOT; };
-		A2181BC410814E7000B8FC7A /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../stacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
+		A2181BC410814E7000B8FC7A /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spursrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
 		A2181BC510814EA000B8FC7A /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; };
 		A2181BC810814EC700B8FC7A /* ac3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ac3.h; sourceTree = "<group>"; };
 		A2181BC910814EC700B8FC7A /* dct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dct.c; sourceTree = "<group>"; };

Modified: branches/Cog/spurcogbuild/macbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/spurcogbuild/macbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/project.pbxproj	2014-03-25 00:48:45 UTC (rev 2883)
+++ branches/Cog/spurcogbuild/macbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/project.pbxproj	2014-03-26 01:03:02 UTC (rev 2884)
@@ -21,7 +21,7 @@
 		730BD72510AA25350023C110 /* SqueakFFIPrims.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = SqueakFFIPrims.c; path = ../../../src/plugins/SqueakFFIPrims/SqueakFFIPrims.c; sourceTree = SOURCE_ROOT; };
 		730BD72710AA26D00023C110 /* sqFFIPlugin.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = sqFFIPlugin.c; path = ../../../platforms/Cross/plugins/SqueakFFIPrims/sqFFIPlugin.c; sourceTree = SOURCE_ROOT; };
 		730BD72910AA26EF0023C110 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; };
-		730BD72A10AA26FB0023C110 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../stacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
+		730BD72A10AA26FB0023C110 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spursrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
 		730BD72D10AA27410023C110 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; };
 		730BD72F10AA27590023C110 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; };
 		730BD73010AA277B0023C110 /* SqueakPlugin.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = SqueakPlugin.icns; path = ../resources/ProjectBuilder/SqueakPlugin.icns; sourceTree = SOURCE_ROOT; };

Modified: branches/Cog/spurcogbuild/macbuild/SqueakMTFFIPrims/SqueakFFI.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/spurcogbuild/macbuild/SqueakMTFFIPrims/SqueakFFI.xcodeproj/project.pbxproj	2014-03-25 00:48:45 UTC (rev 2883)
+++ branches/Cog/spurcogbuild/macbuild/SqueakMTFFIPrims/SqueakFFI.xcodeproj/project.pbxproj	2014-03-26 01:03:02 UTC (rev 2884)
@@ -21,7 +21,7 @@
 		730BD72510AA25350023C110 /* SqueakFFIPrims.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = SqueakFFIPrims.c; path = ../../src/plugins/SqueakFFIPrims/SqueakFFIPrims.c; sourceTree = SOURCE_ROOT; };
 		730BD72710AA26D00023C110 /* sqFFIPlugin.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = sqFFIPlugin.c; path = ../../platforms/Cross/plugins/SqueakFFIPrims/sqFFIPlugin.c; sourceTree = SOURCE_ROOT; };
 		730BD72910AA26EF0023C110 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; };
-		730BD72A10AA26FB0023C110 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../src/vm/interp.h; sourceTree = SOURCE_ROOT; };
+		730BD72A10AA26FB0023C110 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../spursrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
 		730BD72D10AA27410023C110 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; };
 		730BD72F10AA27590023C110 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; };
 		730BD73010AA277B0023C110 /* SqueakPlugin.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = SqueakPlugin.icns; path = ../resources/ProjectBuilder/SqueakPlugin.icns; sourceTree = SOURCE_ROOT; };

Modified: branches/Cog/spurcogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/spurcogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj	2014-03-25 00:48:45 UTC (rev 2883)
+++ branches/Cog/spurcogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj	2014-03-26 01:03:02 UTC (rev 2884)
@@ -23,7 +23,7 @@
 		73D8A6411701272700C66275 /* sqMacSSL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqMacSSL.c; path = "../../../platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c"; sourceTree = SOURCE_ROOT; };
 		8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8D01CCD20486CAD60068D4B7 /* SqueakSSL.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SqueakSSL.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
-		DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../src/vm/interp.h; sourceTree = SOURCE_ROOT; };
+		DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spursrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
 		DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; };
 		DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; };
 		DA3A20F80AA63D000050B983 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; };

Modified: branches/Cog/spurcogbuild/macbuild/Template/Template.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/spurcogbuild/macbuild/Template/Template.xcodeproj/project.pbxproj	2014-03-25 00:48:45 UTC (rev 2883)
+++ branches/Cog/spurcogbuild/macbuild/Template/Template.xcodeproj/project.pbxproj	2014-03-26 01:03:02 UTC (rev 2884)
@@ -15,7 +15,7 @@
 		32BAE0B30371A71500C91783 /* Template_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Template_Prefix.pch; sourceTree = "<group>"; };
 		8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8D01CCD20486CAD60068D4B7 /* Template.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Template.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
-		DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../src/vm/interp.h; sourceTree = SOURCE_ROOT; };
+		DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../spursrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
 		DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; };
 		DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; };
 		DA3A20F80AA63D000050B983 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; };

Modified: branches/Cog/spurcogbuild/macbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/spurcogbuild/macbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj	2014-03-25 00:48:45 UTC (rev 2883)
+++ branches/Cog/spurcogbuild/macbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj	2014-03-26 01:03:02 UTC (rev 2884)
@@ -16,7 +16,7 @@
 		08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
 		7308DE360B9614A4003B7CCD /* UnixOSProcessPlugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = UnixOSProcessPlugin.c; path = ../../../src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c; sourceTree = "<group>"; };
 		73662FE60F53864E00C64E7F /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = Cross/vm/sqMemoryAccess.h; sourceTree = "<group>"; };
-		73662FE70F53864E00C64E7F /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../stacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
+		73662FE70F53864E00C64E7F /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spursrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
 		73662FE80F53864E00C64E7F /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "Mac OS/vm/config.h"; sourceTree = "<group>"; };
 		73662FE90F53864E00C64E7F /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqConfig.h; path = "Mac OS/vm/sqConfig.h"; sourceTree = "<group>"; };
 		73662FEA0F53864E00C64E7F /* sqPlatformSpecific.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqPlatformSpecific.h; path = "Mac OS/vm/sqPlatformSpecific.h"; sourceTree = "<group>"; };

Modified: branches/Cog/spurstackbuild/macbuild/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/spurstackbuild/macbuild/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj	2014-03-25 00:48:45 UTC (rev 2883)
+++ branches/Cog/spurstackbuild/macbuild/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj	2014-03-26 01:03:02 UTC (rev 2884)
@@ -28,7 +28,7 @@
 		08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
 		8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8D01CCD20486CAD60068D4B7 /* CroquetPlugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CroquetPlugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
-		A271C7DD0CEB874D0014AC5E /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../stacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
+		A271C7DD0CEB874D0014AC5E /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
 		A271C7DE0CEB878E0014AC5E /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; };
 		A271C7DF0CEB878E0014AC5E /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; };
 		A271C7E00CEB87BE0014AC5E /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; };

Modified: branches/Cog/spurstackbuild/macbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/spurstackbuild/macbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj	2014-03-25 00:48:45 UTC (rev 2883)
+++ branches/Cog/spurstackbuild/macbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj	2014-03-26 01:03:02 UTC (rev 2884)
@@ -26,7 +26,7 @@
 		08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
 		8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8D01CCD20486CAD60068D4B7 /* FloatArrayPlugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FloatArrayPlugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
-		A271C7DD0CEB874D0014AC5E /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../stacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
+		A271C7DD0CEB874D0014AC5E /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
 		A271C7DE0CEB878E0014AC5E /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; };
 		A271C7DF0CEB878E0014AC5E /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; };
 		A271C7E00CEB87BE0014AC5E /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; };

Modified: branches/Cog/spurstackbuild/macbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/spurstackbuild/macbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj	2014-03-25 00:48:45 UTC (rev 2883)
+++ branches/Cog/spurstackbuild/macbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj	2014-03-26 01:03:02 UTC (rev 2884)
@@ -60,7 +60,7 @@
 		08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
 		8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8D01CCD20486CAD60068D4B7 /* FloatMathPlugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FloatMathPlugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
-		A271C7DD0CEB874D0014AC5E /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../stacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
+		A271C7DD0CEB874D0014AC5E /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
 		A271C7DE0CEB878E0014AC5E /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; };
 		A271C7DF0CEB878E0014AC5E /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; };
 		A271C7E00CEB87BE0014AC5E /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; };

Modified: branches/Cog/spurstackbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/spurstackbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj	2014-03-25 00:48:45 UTC (rev 2883)
+++ branches/Cog/spurstackbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj	2014-03-26 01:03:02 UTC (rev 2884)
@@ -47,7 +47,7 @@
 		A2181BC010814E0B00B8FC7A /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; };
 		A2181BC210814E4E00B8FC7A /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqConfig.h; path = "../../../platforms/Mac OS/vm/sqConfig.h"; sourceTree = SOURCE_ROOT; };
 		A2181BC310814E4E00B8FC7A /* sqPlatformSpecific.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqPlatformSpecific.h; path = "../../../platforms/Mac OS/vm/sqPlatformSpecific.h"; sourceTree = SOURCE_ROOT; };
-		A2181BC410814E7000B8FC7A /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../stacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
+		A2181BC410814E7000B8FC7A /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
 		A2181BC510814EA000B8FC7A /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; };
 		A2181BC810814EC700B8FC7A /* ac3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ac3.h; sourceTree = "<group>"; };
 		A2181BC910814EC700B8FC7A /* dct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dct.c; sourceTree = "<group>"; };

Modified: branches/Cog/spurstackbuild/macbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/spurstackbuild/macbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/project.pbxproj	2014-03-25 00:48:45 UTC (rev 2883)
+++ branches/Cog/spurstackbuild/macbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/project.pbxproj	2014-03-26 01:03:02 UTC (rev 2884)
@@ -21,7 +21,7 @@
 		730BD72510AA25350023C110 /* SqueakFFIPrims.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = SqueakFFIPrims.c; path = ../../../src/plugins/SqueakFFIPrims/SqueakFFIPrims.c; sourceTree = SOURCE_ROOT; };
 		730BD72710AA26D00023C110 /* sqFFIPlugin.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = sqFFIPlugin.c; path = ../../../platforms/Cross/plugins/SqueakFFIPrims/sqFFIPlugin.c; sourceTree = SOURCE_ROOT; };
 		730BD72910AA26EF0023C110 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; };
-		730BD72A10AA26FB0023C110 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../stacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
+		730BD72A10AA26FB0023C110 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
 		730BD72D10AA27410023C110 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; };
 		730BD72F10AA27590023C110 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; };
 		730BD73010AA277B0023C110 /* SqueakPlugin.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = SqueakPlugin.icns; path = ../resources/ProjectBuilder/SqueakPlugin.icns; sourceTree = SOURCE_ROOT; };

Modified: branches/Cog/spurstackbuild/macbuild/Template/Template.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/spurstackbuild/macbuild/Template/Template.xcodeproj/project.pbxproj	2014-03-25 00:48:45 UTC (rev 2883)
+++ branches/Cog/spurstackbuild/macbuild/Template/Template.xcodeproj/project.pbxproj	2014-03-26 01:03:02 UTC (rev 2884)
@@ -15,7 +15,7 @@
 		32BAE0B30371A71500C91783 /* Template_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Template_Prefix.pch; sourceTree = "<group>"; };
 		8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8D01CCD20486CAD60068D4B7 /* Template.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Template.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
-		DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../src/vm/interp.h; sourceTree = SOURCE_ROOT; };
+		DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../spurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
 		DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; };
 		DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; };
 		DA3A20F80AA63D000050B983 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; };

Modified: branches/Cog/spurstackbuild/macbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/spurstackbuild/macbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj	2014-03-25 00:48:45 UTC (rev 2883)
+++ branches/Cog/spurstackbuild/macbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj	2014-03-26 01:03:02 UTC (rev 2884)
@@ -16,7 +16,7 @@
 		08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
 		7308DE360B9614A4003B7CCD /* UnixOSProcessPlugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = UnixOSProcessPlugin.c; path = ../../../src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c; sourceTree = "<group>"; };
 		73662FE60F53864E00C64E7F /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = Cross/vm/sqMemoryAccess.h; sourceTree = "<group>"; };
-		73662FE70F53864E00C64E7F /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../stacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
+		73662FE70F53864E00C64E7F /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
 		73662FE80F53864E00C64E7F /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "Mac OS/vm/config.h"; sourceTree = "<group>"; };
 		73662FE90F53864E00C64E7F /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqConfig.h; path = "Mac OS/vm/sqConfig.h"; sourceTree = "<group>"; };
 		73662FEA0F53864E00C64E7F /* sqPlatformSpecific.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqPlatformSpecific.h; path = "Mac OS/vm/sqPlatformSpecific.h"; sourceTree = "<group>"; };

Added: branches/Cog/src/plugins/ImmX11Plugin/ImmX11Plugin.c
===================================================================
--- branches/Cog/src/plugins/ImmX11Plugin/ImmX11Plugin.c	                        (rev 0)
+++ branches/Cog/src/plugins/ImmX11Plugin/ImmX11Plugin.c	2014-03-26 01:03:02 UTC (rev 2884)
@@ -0,0 +1,582 @@
+/* Automatically generated by
+	SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.656 uuid: 03e04241-b10f-4620-9be5-99543d124412
+   from
+	ImmX11Plugin VMMaker.oscog-eem.656 uuid: 03e04241-b10f-4620-9be5-99543d124412
+ */
+static char __buildInfo[] = "ImmX11Plugin VMMaker.oscog-eem.656 uuid: 03e04241-b10f-4620-9be5-99543d124412 " __DATE__ ;
+
+
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <locale.h>
+
+/* Default EXPORT macro that does nothing (see comment in sq.h): */
+#define EXPORT(returnType) returnType
+
+/* Do not include the entire sq.h file but just those parts needed. */
+/*  The virtual machine proxy definition */
+#include "sqVirtualMachine.h"
+/* Configuration options */
+#include "sqConfig.h"
+/* Platform specific definitions */
+#include "sqPlatformSpecific.h"
+
+#define true 1
+#define false 0
+#define null 0  /* using 'null' because nil is predefined in Think C */
+#ifdef SQUEAK_BUILTIN_PLUGIN
+#undef EXPORT
+// was #undef EXPORT(returnType) but screws NorCroft cc
+#define EXPORT(returnType) static returnType
+#endif
+
+#include "sqUnixMain.h"
+#include "sqUnixCharConv.h"
+extern char *setLocale(char *, size_t);
+extern int setCompositionWindowPosition(int, int);
+extern int setCompostionFocus(int);
+#include "sqMemoryAccess.h"
+
+
+/*** Constants ***/
+
+
+/*** Function Prototypes ***/
+static VirtualMachine * getInterpreter(void);
+EXPORT(const char*) getModuleName(void);
+static sqInt halt(void);
+EXPORT(sqInt) initialiseModule(void);
+static sqInt msg(char *s);
+EXPORT(sqInt) primGetEncoding(void);
+EXPORT(sqInt) primGetLocale(void);
+EXPORT(sqInt) primGetLocaleEncoding(void);
+EXPORT(sqInt) primGetPathEnc(void);
+EXPORT(sqInt) primGetTextEnc(void);
+EXPORT(sqInt) primGetXWinEnc(void);
+EXPORT(sqInt) primIsTextEncUTF8(void);
+EXPORT(sqInt) primSetCompositionFocus(void);
+EXPORT(sqInt) primSetCompositionWindowPosition(void);
+EXPORT(sqInt) primSetEncodingToLocale(void);
+EXPORT(sqInt) primSetEncoding(sqInt encoding);
+EXPORT(sqInt) primSetLocaleEncoding(sqInt encoding);
+EXPORT(sqInt) primSetLocale(sqInt locale);
+EXPORT(sqInt) primSetPathEncToLocale(void);
+EXPORT(sqInt) primSetPathEnc(sqInt encoding);
+EXPORT(sqInt) primSetTextEncToLocale(void);
+EXPORT(sqInt) primSetTextEncUTF8(void);
+EXPORT(sqInt) primSetTextEnc(sqInt encoding);
+EXPORT(sqInt) primSetXWinEncToLocale(void);
+EXPORT(sqInt) primSetXWinEnc(sqInt encoding);
+EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter);
+EXPORT(sqInt) shutdownModule(void);
+static sqInt sqAssert(sqInt aBool);
+
+
+/*** Variables ***/
+
+#if !defined(SQUEAK_BUILTIN_PLUGIN)
+static void * (*arrayValueOf)(sqInt oop);
+static sqInt (*booleanValueOf)(sqInt obj);
+static sqInt (*classString)(void);
+static sqInt (*failed)(void);
+static sqInt (*falseObject)(void);
+static void * (*firstIndexableField)(sqInt oop);
+static sqInt (*instantiateClassindexableSize)(sqInt classPointer, sqInt size);
+static sqInt (*nilObject)(void);
+static sqInt (*popthenPush)(sqInt nItems, sqInt oop);
+static sqInt (*primitiveFail)(void);
+static sqInt (*stSizeOf)(sqInt oop);
+static sqInt (*stackIntegerValue)(sqInt offset);
+static sqInt (*stackValue)(sqInt offset);
+static sqInt (*trueObject)(void);
+#else /* !defined(SQUEAK_BUILTIN_PLUGIN) */
+extern void * arrayValueOf(sqInt oop);
+extern sqInt booleanValueOf(sqInt obj);
+extern sqInt classString(void);
+extern sqInt failed(void);
+extern sqInt falseObject(void);
+extern void * firstIndexableField(sqInt oop);
+extern sqInt instantiateClassindexableSize(sqInt classPointer, sqInt size);
+extern sqInt nilObject(void);
+extern sqInt popthenPush(sqInt nItems, sqInt oop);
+extern sqInt primitiveFail(void);
+extern sqInt stSizeOf(sqInt oop);
+extern sqInt stackIntegerValue(sqInt offset);
+extern sqInt stackValue(sqInt offset);
+extern sqInt trueObject(void);
+extern
+#endif
+struct VirtualMachine* interpreterProxy;
+static const char *moduleName =
+#ifdef SQUEAK_BUILTIN_PLUGIN
+	"ImmX11Plugin * VMMaker.oscog-eem.656 (i)"
+#else
+	"ImmX11Plugin * VMMaker.oscog-eem.656 (e)"
+#endif
+;
+
+
+
+/*	Note: This is coded so that plugins can be run from Squeak. */
+
+static VirtualMachine *
+getInterpreter(void)
+{
+	return interpreterProxy;
+}
+
+
+/*	Note: This is hardcoded so it can be run from Squeak.
+	The module name is used for validating a module *after*
+	it is loaded to check if it does really contain the module
+	we're thinking it contains. This is important! */
+
+EXPORT(const char*)
+getModuleName(void)
+{
+	return moduleName;
+}
+
+static sqInt
+halt(void)
+{
+	;
+	return 0;
+}
+
+EXPORT(sqInt)
+initialiseModule(void)
+{
+	return 1;
+}
+
+static sqInt
+msg(char *s)
+{
+	fprintf(stderr, "\n%s: %s", moduleName, s);
+	return 0;
+}
+
+EXPORT(sqInt)
+primGetEncoding(void)
+{
+	char *array;
+	int len;
+	sqInt ret;
+
+	len = strlen(sqTextEncoding);
+	ret = instantiateClassindexableSize(classString(), len);
+	array = ((char *) (firstIndexableField(ret)));
+	strncpy(array, (char *)sqTextEncoding, len);
+	return ret;
+}
+
+EXPORT(sqInt)
+primGetLocale(void)
+{
+	char *array;
+	int len;
+	char *locale;
+	sqInt ret;
+
+	locale = setlocale(LC_CTYPE, "");
+	if (locale) {
+		len = strlen(locale);
+		ret = instantiateClassindexableSize(classString(), len);
+		array = ((char *) (firstIndexableField(ret)));
+		strncpy(array, (char *)locale, len);
+	}
+	else {
+		ret = nilObject();
+	}
+	return ret;
+}
+
+EXPORT(sqInt)
+primGetLocaleEncoding(void)
+{
+	char *array;
+	int len;
+	sqInt ret;
+
+	if ((int) localeEncoding) {
+		len = strlen(localeEncoding);
+		ret = instantiateClassindexableSize(classString(), len);
+		array = ((char *) (firstIndexableField(ret)));
+		strncpy(array, (char *)localeEncoding, len);
+	}
+	else {
+		ret = nilObject();
+	}
+	return ret;
+}
+
+EXPORT(sqInt)
+primGetPathEnc(void)
+{
+	char *array;
+	int len;
+	sqInt ret;
+
+	len = strlen(uxPathEncoding);
+	ret = instantiateClassindexableSize(classString(), len);
+	array = ((char *) (firstIndexableField(ret)));
+	strncpy(array, (char *)uxPathEncoding, len);
+	return ret;
+}
+
+EXPORT(sqInt)
+primGetTextEnc(void)
+{
+	char *array;
+	int len;
+	sqInt ret;
+
+	len = strlen(uxTextEncoding);
+	ret = instantiateClassindexableSize(classString(), len);
+	array = ((char *) (firstIndexableField(ret)));
+	strncpy(array, (char *)uxTextEncoding, len);
+	return ret;
+}
+
+EXPORT(sqInt)
+primGetXWinEnc(void)
+{
+	char *array;
+	int len;
+	sqInt ret;
+
+	len = strlen(uxXWinEncoding);
+	ret = instantiateClassindexableSize(classString(), len);
+	array = ((char *) (firstIndexableField(ret)));
+	strncpy(array, (char *)uxXWinEncoding, len);
+	return ret;
+}
+
+EXPORT(sqInt)
+primIsTextEncUTF8(void)
+{
+	sqInt _return_value;
+
+	_return_value = (((textEncodingUTF8)) ? trueObject() : falseObject());
+	if (failed()) {
+		return null;
+	}
+	popthenPush(1, _return_value);
+	return null;
+}
+
+EXPORT(sqInt)
+primSetCompositionFocus(void)
+{
+	sqInt bool;
+	sqInt ret;
+	sqInt _return_value;
+
+	bool = booleanValueOf(stackValue(0));
+	if (failed()) {
+		return null;
+	}
+	ret = setCompositionFocus(bool);
+	if (ret == 0) {
+		primitiveFail();
+		return null;
+	}
+	_return_value = ((ret) ? trueObject() : falseObject());
+	if (failed()) {
+		return null;
+	}
+	popthenPush(2, _return_value);
+	return null;
+}
+
+EXPORT(sqInt)
+primSetCompositionWindowPosition(void)
+{
+	sqInt ret;
+	sqInt x;
+	sqInt y;
+	sqInt _return_value;
+
+	x = stackIntegerValue(1);
+	y = stackIntegerValue(0);
+	if (failed()) {
+		return null;
+	}
+	ret = setCompositionWindowPosition(x, y);
+	if (ret == 0) {
+		primitiveFail();
+		return null;
+	}
+	_return_value = ((ret) ? trueObject() : falseObject());
+	if (failed()) {
+		return null;
+	}
+	popthenPush(3, _return_value);
+	return null;
+}
+
+EXPORT(sqInt)
+primSetEncodingToLocale(void)
+{
+	sqInt ret;
+
+	if ((int) localeEncoding) {
+		sqTextEncoding = (void *)localeEncoding;
+		ret = trueObject();
+	}
+	else {
+		ret = falseObject();
+	}
+	if (failed()) {
+		return null;
+	}
+	popthenPush(1, ret);
+	return null;
+}
+
+EXPORT(sqInt)
+primSetEncoding(sqInt encoding)
+{
+	size_t len;
+	char *name;
+
+	len = stSizeOf(encoding);
+	name = ((char *) (firstIndexableField(encoding)));
+	setNEncoding(&sqTextEncoding, name, len);
+	return encoding;
+}
+
+EXPORT(sqInt)
+primSetLocaleEncoding(sqInt encoding)
+{
+	size_t len;
+	char *name;
+
+	len = stSizeOf(encoding);
+	name = ((char *) (firstIndexableField(encoding)));
+	setNEncoding(&localeEncoding, name, len);
+	sqTextEncoding= uxTextEncoding= uxPathEncoding= uxXWinEncoding= localeEncoding;
+	return encoding;
+}
+
+EXPORT(sqInt)
+primSetLocale(sqInt locale)
+{
+	char *array;
+	size_t len;
+	char *name;
+	sqInt ret;
+
+	len = stSizeOf(locale);
+	name = ((char *) (arrayValueOf(locale)));
+	name = setLocale(name, len);
+	if ((int) name) {
+		len = strlen(name);
+		ret = instantiateClassindexableSize(classString(), len);
+		array = ((char *) (firstIndexableField(ret)));
+		strncpy(array, (char *)name, len);
+		return ret;
+	}
+	else {
+		return nilObject();
+	}
+}
+
+EXPORT(sqInt)
+primSetPathEncToLocale(void)
+{
+	sqInt ret;
+
+	if ((int) localeEncoding) {
+		uxPathEncoding = (void *)localeEncoding;
+		ret = trueObject();
+	}
+	else {
+		ret = falseObject();
+	}
+	if (failed()) {
+		return null;
+	}
+	popthenPush(1, ret);
+	return null;
+}
+
+EXPORT(sqInt)
+primSetPathEnc(sqInt encoding)
+{
+	size_t len;
+	char *name;
+
+	len = stSizeOf(encoding);
+	name = ((char *) (firstIndexableField(encoding)));
+	setNEncoding(&uxPathEncoding, name, len);
+	return encoding;
+}
+
+EXPORT(sqInt)
+primSetTextEncToLocale(void)
+{
+	sqInt ret;
+
+	if ((int) localeEncoding) {
+		uxTextEncoding = (void *)localeEncoding;
+		ret = trueObject();
+	}
+	else {
+		ret = falseObject();
+	}
+	if (failed()) {
+		return null;
+	}
+	popthenPush(1, ret);
+	return null;
+}
+
+EXPORT(sqInt)
+primSetTextEncUTF8(void)
+{
+	sqInt bool;
+	sqInt _return_value;
+

@@ Diff output truncated at 50000 characters. @@


More information about the Vm-dev mailing list