[Vm-dev] [commit][3694] Mac OS X build changes.
commits at squeakvm.org
commits at squeakvm.org
Wed May 4 18:45:04 UTC 2016
Revision: 3694
Author: eliot
Date: 2016-05-04 11:45:02 -0700 (Wed, 04 May 2016)
Log Message:
-----------
Mac OS X build changes.
Move the MIDI plugin to external, adding a Makefile. It does not work under
Cocoa yetm and so is more convenient to work on externally. Move FloatArray &
FloatMath plugins to internal; they're small, useful and stable. Fix dependency
when plugins change from being internal to external and vice verse; they must be
recompiled. Exclude sqMacV2Window.m SqViewBitmapConversion.m & SqViewClut.m;
JMM says these shouldn't be included. rename the immutability build to
squeak.cog.spur+immutability (for "naming consistency"). Add some ignore props.
Modified Paths:
--------------
branches/Cog/build.macos32x86/common/Makefile.plugin
branches/Cog/build.macos32x86/common/Makefile.vm
branches/Cog/build.macos32x86/makeproduct
branches/Cog/build.macos32x86/makeproductclean
branches/Cog/build.macos32x86/squeak.cog.spur/plugins.ext
branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int
branches/Cog/build.macos32x86/squeak.cog.spur+immutability/plugins.ext
branches/Cog/build.macos32x86/squeak.cog.spur+immutability/plugins.int
branches/Cog/build.macos32x86/squeak.cog.v3/plugins.ext
branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int
branches/Cog/build.macos32x86/squeak.sista.spur/Makefile
branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext
branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int
branches/Cog/build.macos32x86/squeak.stack.spur/plugins.ext
branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int
branches/Cog/build.macos32x86/squeak.stack.v3/plugins.ext
branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int
branches/Cog/build.macos64x64/common/Makefile.plugin
branches/Cog/build.macos64x64/common/Makefile.vm
branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int
branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext
branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int
branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.ext
branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.int
branches/Cog/build.macos64x64/squeak.sista.spur/Makefile
branches/Cog/build.macos64x64/squeak.sista.spur/plugins.ext
branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int
branches/Cog/build.macos64x64/squeak.stack.spur/plugins.ext
branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int
Added Paths:
-----------
branches/Cog/build.macos32x86/squeak.cog.spur+immutability/
branches/Cog/platforms/iOS/plugins/MIDIPlugin/Makefile
Removed Paths:
-------------
branches/Cog/build.macos32x86/squeak+immutability.cog.spur/
branches/Cog/build.macos32x86/squeak.cog.spur.immutability/
Property Changed:
----------------
branches/Cog/build.macos32x86/glue.cog.spur/
Modified: branches/Cog/build.macos32x86/common/Makefile.plugin
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.plugin 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos32x86/common/Makefile.plugin 2016-05-04 18:45:02 UTC (rev 3694)
@@ -102,6 +102,9 @@
VPATH:= $(SRCDIRS)
+# If plugins change from internal to external they must be recompiled.
+$(BUILD)/$(LIBNAME)/$(LIBNAME).o: plugins.int plugins.ext
+
#############################################################################
# Rules for automated builds
Modified: branches/Cog/build.macos32x86/common/Makefile.vm
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.vm 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos32x86/common/Makefile.vm 2016-05-04 18:45:02 UTC (rev 3694)
@@ -52,10 +52,13 @@
MAKERSRC:=$(wildcard $(VMSRCDIR)/gcc3x-*interp.c $(VMSRCDIR)/cogit.c)
CROSSSRC:= $(wildcard $(CROSSDIR)/*.c)
-XEX:=%/sqSqueakMainApplication+screen.m
-OSXSRC:=$(wildcard $(OSXDIR)/*.c) $(filter-out $(XEX),$(wildcard $(OSXDIR)/*.m)) \
+#XEX:= ... %/sqMacV2Browser.m ...
+XEX:=%/sqSqueakMainApplication+screen.m %/sqMacV2Window.m \
+ %/SqViewBitmapConversion.m %/SqViewClut.m
+OSXSRC=$(wildcard $(OSXDIR)/*.c) $(wildcard $(OSXDIR)/*.m) \
$(wildcard $(OSXCOMMONDIR)/*.c) $(wildcard $(OSXCOMMONDIR)/*.m) \
$(wildcard $(OSXCLASSESDIR)/*.c) $(wildcard $(OSXCLASSESDIR)/*.m)
+OSXSRC:=$(filter-out $(XEX),$(OSXSRC))
UNIXSRC:=$(addprefix $(UNIXVMDIR)/,aio.c sqUnixHeartbeat.c sqUnixSpurMemory.c \
sqUnixThreads.c sqUnixVMProfile.c)
VMSRC:= $(MAKERSRC) $(CROSSSRC) $(OSXSRC) $(UNIXSRC)
Property changes on: branches/Cog/build.macos32x86/glue.cog.spur
___________________________________________________________________
Modified: svn:ignore
- Cocoa*.app
build*
deps
getversion*
sqNamedPrims.h
+ Cocoa*.app
LOG*
*.sources
build*
deps
getversion*
sqNamedPrims.h
Modified: branches/Cog/build.macos32x86/makeproduct
===================================================================
--- branches/Cog/build.macos32x86/makeproduct 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos32x86/makeproduct 2016-05-04 18:45:02 UTC (rev 3694)
@@ -1,6 +1,6 @@
#!/bin/bash
trap 'exit 2' HUP INT PIPE TERM
-PRODUCTDIRS="newspeak.cog.spur pharo.cog.spur squeak.cog.spur squeak.cog.v3 squeak.cog.spur.immutability"
+PRODUCTDIRS="newspeak.cog.spur pharo.cog.spur squeak.cog.spur squeak.cog.v3 squeak.cog.spur+immutability"
for d in $PRODUCTDIRS; do
if test -d "$d"; then
(cd ./$d;./mvm -A)
Modified: branches/Cog/build.macos32x86/makeproductclean
===================================================================
--- branches/Cog/build.macos32x86/makeproductclean 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos32x86/makeproductclean 2016-05-04 18:45:02 UTC (rev 3694)
@@ -1,6 +1,6 @@
#!/bin/bash
trap 'exit 2' HUP INT PIPE TERM
-PRODUCTDIRS="newspeak.cog.spur pharo.cog.spur squeak.cog.spur squeak.cog.v3 squeak.cog.spur.immutability"
+PRODUCTDIRS="newspeak.cog.spur pharo.cog.spur squeak.cog.spur squeak.cog.v3 squeak.cog.spur+immutability"
for d in $PRODUCTDIRS; do
if test -d "$d"; then
(cd ./$d;echo $d;make cleanall)
Modified: branches/Cog/build.macos32x86/squeak.cog.spur/plugins.ext
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/plugins.ext 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/plugins.ext 2016-05-04 18:45:02 UTC (rev 3694)
@@ -1,13 +1,12 @@
# Copied, perhaps edited, from ../src/examplePlugins.ext
+# MIDIPlugin does not work on Cocoa so keep it external until it can be fixed.
EXTERNAL_PLUGINS = \
BochsIA32Plugin \
BochsX64Plugin \
GdbARMPlugin \
CroquetPlugin \
-FloatArrayPlugin \
-FloatMathPlugin \
+MIDIPlugin \
Mpeg3Plugin \
SqueakFFIPrims \
SqueakSSL \
-UUIDPlugin \
UnixOSProcessPlugin
Modified: branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int 2016-05-04 18:45:02 UTC (rev 3694)
@@ -11,6 +11,8 @@
DSAPrims \
FFTPlugin \
FilePlugin \
+FloatArrayPlugin \
+FloatMathPlugin \
HostWindowPlugin \
IA32ABI \
JPEGReaderPlugin \
@@ -18,9 +20,7 @@
Klatt \
LargeIntegers \
LocalePlugin \
-MacMenubarPlugin \
Matrix2x3Plugin \
-MIDIPlugin \
MiscPrimitivePlugin \
RePlugin \
SecurityPlugin \
@@ -31,7 +31,9 @@
SoundPlugin \
StarSqueakPlugin \
SurfacePlugin \
+UUIDPlugin \
VMProfileMacSupportPlugin \
# B3DAcceleratorPlugin \
# InternetConfigPlugin \
-# JoystickTabletPlugin
+# JoystickTabletPlugin \
+# MacMenubarPlugin # Does not work under Cocoa
Modified: branches/Cog/build.macos32x86/squeak.cog.spur+immutability/plugins.ext
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur.immutability/plugins.ext 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos32x86/squeak.cog.spur+immutability/plugins.ext 2016-05-04 18:45:02 UTC (rev 3694)
@@ -1,13 +1,12 @@
# Copied, perhaps edited, from ../src/examplePlugins.ext
+# MIDIPlugin does not work on Cocoa so keep it external until it can be fixed.
EXTERNAL_PLUGINS = \
BochsIA32Plugin \
BochsX64Plugin \
GdbARMPlugin \
CroquetPlugin \
-FloatArrayPlugin \
-FloatMathPlugin \
+MIDIPlugin \
Mpeg3Plugin \
SqueakFFIPrims \
SqueakSSL \
-UUIDPlugin \
UnixOSProcessPlugin
Modified: branches/Cog/build.macos32x86/squeak.cog.spur+immutability/plugins.int
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur.immutability/plugins.int 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos32x86/squeak.cog.spur+immutability/plugins.int 2016-05-04 18:45:02 UTC (rev 3694)
@@ -11,6 +11,8 @@
DSAPrims \
FFTPlugin \
FilePlugin \
+FloatArrayPlugin \
+FloatMathPlugin \
HostWindowPlugin \
IA32ABI \
JPEGReaderPlugin \
@@ -18,9 +20,7 @@
Klatt \
LargeIntegers \
LocalePlugin \
-MacMenubarPlugin \
Matrix2x3Plugin \
-MIDIPlugin \
MiscPrimitivePlugin \
RePlugin \
SecurityPlugin \
@@ -31,7 +31,9 @@
SoundPlugin \
StarSqueakPlugin \
SurfacePlugin \
+UUIDPlugin \
VMProfileMacSupportPlugin \
# B3DAcceleratorPlugin \
# InternetConfigPlugin \
-# JoystickTabletPlugin
+# JoystickTabletPlugin \
+# MacMenubarPlugin # Does not work under Cocoa
Modified: branches/Cog/build.macos32x86/squeak.cog.v3/plugins.ext
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.v3/plugins.ext 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos32x86/squeak.cog.v3/plugins.ext 2016-05-04 18:45:02 UTC (rev 3694)
@@ -1,8 +1,11 @@
# Copied, perhaps edited, from ../src/examplePlugins.ext
+# MIDIPlugin does not work on Cocoa so keep it external until it can be fixed.
EXTERNAL_PLUGINS = \
+BochsIA32Plugin \
+BochsX64Plugin \
+GdbARMPlugin \
CroquetPlugin \
-FloatArrayPlugin \
-FloatMathPlugin \
+MIDIPlugin \
Mpeg3Plugin \
SqueakFFIPrims \
SqueakSSL \
Modified: branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int 2016-05-04 18:45:02 UTC (rev 3694)
@@ -11,6 +11,8 @@
DSAPrims \
FFTPlugin \
FilePlugin \
+FloatArrayPlugin \
+FloatMathPlugin \
HostWindowPlugin \
IA32ABI \
JPEGReaderPlugin \
@@ -31,4 +33,7 @@
SurfacePlugin \
UUIDPlugin \
VMProfileMacSupportPlugin \
-# JoystickTabletPlugin
+# B3DAcceleratorPlugin \
+# InternetConfigPlugin \
+# JoystickTabletPlugin \
+# MacMenubarPlugin # Does not work under Cocoa
Modified: branches/Cog/build.macos32x86/squeak.sista.spur/Makefile
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/Makefile 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/Makefile 2016-05-04 18:45:02 UTC (rev 3694)
@@ -4,6 +4,7 @@
#
VMSRCDIR:= ../../spursistasrc/vm
+COGDEFS=-DIMMUTABILITY=1
SOURCEFILE:=SqueakV50.sources
APPPOST:=overwriteSqueakIcon
Modified: branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext 2016-05-04 18:45:02 UTC (rev 3694)
@@ -1,13 +1,12 @@
# Copied, perhaps edited, from ../src/examplePlugins.ext
+# MIDIPlugin does not work on Coca so keeping it external until it can be fixed.
EXTERNAL_PLUGINS = \
BochsIA32Plugin \
BochsX64Plugin \
GdbARMPlugin \
CroquetPlugin \
-FloatArrayPlugin \
-FloatMathPlugin \
+MIDIPlugin \
Mpeg3Plugin \
SqueakFFIPrims \
SqueakSSL \
-UUIDPlugin \
UnixOSProcessPlugin
Modified: branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int 2016-05-04 18:45:02 UTC (rev 3694)
@@ -11,6 +11,8 @@
DSAPrims \
FFTPlugin \
FilePlugin \
+FloatArrayPlugin \
+FloatMathPlugin \
HostWindowPlugin \
IA32ABI \
JPEGReaderPlugin \
@@ -29,5 +31,9 @@
SoundPlugin \
StarSqueakPlugin \
SurfacePlugin \
+UUIDPlugin \
VMProfileMacSupportPlugin \
-# JoystickTabletPlugin
+# B3DAcceleratorPlugin \
+# InternetConfigPlugin \
+# JoystickTabletPlugin \
+# MacMenubarPlugin # Does not work under Cocoa
Modified: branches/Cog/build.macos32x86/squeak.stack.spur/plugins.ext
===================================================================
--- branches/Cog/build.macos32x86/squeak.stack.spur/plugins.ext 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos32x86/squeak.stack.spur/plugins.ext 2016-05-04 18:45:02 UTC (rev 3694)
@@ -1,10 +1,9 @@
# Copied, perhaps edited, from ../src/examplePlugins.ext
+# MIDIPlugin does not work on Cocoa so keep it external until it can be fixed.
EXTERNAL_PLUGINS = \
CroquetPlugin \
-FloatArrayPlugin \
-FloatMathPlugin \
+MIDIPlugin \
Mpeg3Plugin \
SqueakFFIPrims \
SqueakSSL \
-UUIDPlugin \
UnixOSProcessPlugin
Modified: branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int
===================================================================
--- branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int 2016-05-04 18:45:02 UTC (rev 3694)
@@ -11,6 +11,8 @@
DSAPrims \
FFTPlugin \
FilePlugin \
+FloatArrayPlugin \
+FloatMathPlugin \
HostWindowPlugin \
IA32ABI \
JPEGReaderPlugin \
@@ -29,5 +31,9 @@
SoundPlugin \
StarSqueakPlugin \
SurfacePlugin \
+UUIDPlugin \
VMProfileMacSupportPlugin \
-# JoystickTabletPlugin
+# B3DAcceleratorPlugin \
+# InternetConfigPlugin \
+# JoystickTabletPlugin \
+# MacMenubarPlugin # Does not work under Cocoa
Modified: branches/Cog/build.macos32x86/squeak.stack.v3/plugins.ext
===================================================================
--- branches/Cog/build.macos32x86/squeak.stack.v3/plugins.ext 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos32x86/squeak.stack.v3/plugins.ext 2016-05-04 18:45:02 UTC (rev 3694)
@@ -1,8 +1,8 @@
# Copied, perhaps edited, from ../src/examplePlugins.ext
+# MIDIPlugin does not work on Cocoa so keep it external until it can be fixed.
EXTERNAL_PLUGINS = \
CroquetPlugin \
-FloatArrayPlugin \
-FloatMathPlugin \
+MIDIPlugin \
Mpeg3Plugin \
SqueakFFIPrims \
SqueakSSL \
Modified: branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int
===================================================================
--- branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int 2016-05-04 18:45:02 UTC (rev 3694)
@@ -11,6 +11,8 @@
DSAPrims \
FFTPlugin \
FilePlugin \
+FloatArrayPlugin \
+FloatMathPlugin \
HostWindowPlugin \
IA32ABI \
JPEGReaderPlugin \
@@ -31,4 +33,7 @@
SurfacePlugin \
UUIDPlugin \
VMProfileMacSupportPlugin \
-# JoystickTabletPlugin
+# B3DAcceleratorPlugin \
+# InternetConfigPlugin \
+# JoystickTabletPlugin \
+# MacMenubarPlugin # Does not work under Cocoa
Modified: branches/Cog/build.macos64x64/common/Makefile.plugin
===================================================================
--- branches/Cog/build.macos64x64/common/Makefile.plugin 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos64x64/common/Makefile.plugin 2016-05-04 18:45:02 UTC (rev 3694)
@@ -102,6 +102,9 @@
VPATH:= $(SRCDIRS)
+# If plugins change from internal to external they must be recompiled.
+$(BUILD)/$(LIBNAME)/$(LIBNAME).o: plugins.int plugins.ext
+
#############################################################################
# Rules for automated builds
Modified: branches/Cog/build.macos64x64/common/Makefile.vm
===================================================================
--- branches/Cog/build.macos64x64/common/Makefile.vm 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos64x64/common/Makefile.vm 2016-05-04 18:45:02 UTC (rev 3694)
@@ -52,10 +52,13 @@
MAKERSRC:=$(wildcard $(VMSRCDIR)/gcc3x-*interp.c $(VMSRCDIR)/cogit.c)
CROSSSRC:= $(wildcard $(CROSSDIR)/*.c)
-XEX:=%/sqSqueakMainApplication+screen.m
-OSXSRC:=$(wildcard $(OSXDIR)/*.c) $(filter-out $(XEX),$(wildcard $(OSXDIR)/*.m)) \
+#XEX:= ... %/sqMacV2Browser.m ...
+XEX:=%/sqSqueakMainApplication+screen.m %/sqMacV2Window.m \
+ %/SqViewBitmapConversion.m %/SqViewClut.m
+OSXSRC=$(wildcard $(OSXDIR)/*.c) $(wildcard $(OSXDIR)/*.m) \
$(wildcard $(OSXCOMMONDIR)/*.c) $(wildcard $(OSXCOMMONDIR)/*.m) \
$(wildcard $(OSXCLASSESDIR)/*.c) $(wildcard $(OSXCLASSESDIR)/*.m)
+OSXSRC:=$(filter-out $(XEX),$(OSXSRC))
UNIXSRC:=$(addprefix $(UNIXVMDIR)/,aio.c sqUnixHeartbeat.c sqUnixSpurMemory.c \
sqUnixThreads.c sqUnixVMProfile.c)
VMSRC:= $(MAKERSRC) $(CROSSSRC) $(OSXSRC) $(UNIXSRC)
Modified: branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int
===================================================================
--- branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int 2016-05-04 18:45:02 UTC (rev 3694)
@@ -32,4 +32,4 @@
UUIDPlugin \
VMProfileMacSupportPlugin \
# JoystickTabletPlugin \
-# SerialPlugin
+# SerialPlugin # Does not compile under 64-bits
Modified: branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext
===================================================================
--- branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext 2016-05-04 18:45:02 UTC (rev 3694)
@@ -1,11 +1,12 @@
# Copied, perhaps edited, from ../src/examplePlugins.ext
+# MIDIPlugin does not work on Cocoa so keep it external until it can be fixed.
EXTERNAL_PLUGINS = \
BochsIA32Plugin \
+BochsX64Plugin \
+GdbARMPlugin \
CroquetPlugin \
-FloatArrayPlugin \
-FloatMathPlugin \
+MIDIPlugin \
Mpeg3Plugin \
SqueakFFIPrims \
SqueakSSL \
-UUIDPlugin \
UnixOSProcessPlugin
Modified: branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int
===================================================================
--- branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int 2016-05-04 18:45:02 UTC (rev 3694)
@@ -11,6 +11,8 @@
DSAPrims \
FFTPlugin \
FilePlugin \
+FloatArrayPlugin \
+FloatMathPlugin \
HostWindowPlugin \
IA32ABI \
JPEGReaderPlugin \
@@ -18,7 +20,6 @@
Klatt \
LargeIntegers \
LocalePlugin \
-MacMenubarPlugin \
Matrix2x3Plugin \
MiscPrimitivePlugin \
RePlugin \
@@ -29,9 +30,10 @@
SoundPlugin \
StarSqueakPlugin \
SurfacePlugin \
+UUIDPlugin \
VMProfileMacSupportPlugin \
# B3DAcceleratorPlugin \
# InternetConfigPlugin \
# JoystickTabletPlugin \
-# MIDIPlugin \
-# SerialPlugin
+# MacMenubarPlugin # Does not work under Cocoa \
+# SerialPlugin # Does not compile under 64-bits
Modified: branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.ext
===================================================================
--- branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.ext 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.ext 2016-05-04 18:45:02 UTC (rev 3694)
@@ -1,11 +1,12 @@
# Copied, perhaps edited, from ../src/examplePlugins.ext
+# MIDIPlugin does not work on Coca so keeping it external until it can be fixed.
EXTERNAL_PLUGINS = \
BochsIA32Plugin \
+BochsX64Plugin \
+GdbARMPlugin \
CroquetPlugin \
-FloatArrayPlugin \
-FloatMathPlugin \
+MIDIPlugin \
Mpeg3Plugin \
SqueakFFIPrims \
SqueakSSL \
-UUIDPlugin \
UnixOSProcessPlugin
Modified: branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.int
===================================================================
--- branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.int 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.int 2016-05-04 18:45:02 UTC (rev 3694)
@@ -11,6 +11,8 @@
DSAPrims \
FFTPlugin \
FilePlugin \
+FloatArrayPlugin \
+FloatMathPlugin \
HostWindowPlugin \
IA32ABI \
JPEGReaderPlugin \
@@ -18,7 +20,6 @@
Klatt \
LargeIntegers \
LocalePlugin \
-MacMenubarPlugin \
Matrix2x3Plugin \
MiscPrimitivePlugin \
RePlugin \
@@ -29,9 +30,10 @@
SoundPlugin \
StarSqueakPlugin \
SurfacePlugin \
+UUIDPlugin \
VMProfileMacSupportPlugin \
# B3DAcceleratorPlugin \
# InternetConfigPlugin \
# JoystickTabletPlugin \
-# MIDIPlugin \
-# SerialPlugin
+# MacMenubarPlugin # Does not work under Cocoa \
+# SerialPlugin # Does not compile under 64-bits
Modified: branches/Cog/build.macos64x64/squeak.sista.spur/Makefile
===================================================================
--- branches/Cog/build.macos64x64/squeak.sista.spur/Makefile 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos64x64/squeak.sista.spur/Makefile 2016-05-04 18:45:02 UTC (rev 3694)
@@ -4,6 +4,7 @@
#
VMSRCDIR:= ../../spursista64src/vm
+COGDEFS=-DIMMUTABILITY=1
SOURCEFILE:=SqueakV50.sources
APPPOST:=overwriteSqueakIcon
Modified: branches/Cog/build.macos64x64/squeak.sista.spur/plugins.ext
===================================================================
--- branches/Cog/build.macos64x64/squeak.sista.spur/plugins.ext 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos64x64/squeak.sista.spur/plugins.ext 2016-05-04 18:45:02 UTC (rev 3694)
@@ -1,11 +1,12 @@
# Copied, perhaps edited, from ../src/examplePlugins.ext
+# MIDIPlugin does not work on Coca so keeping it external until it can be fixed.
EXTERNAL_PLUGINS = \
BochsIA32Plugin \
+BochsX64Plugin \
+GdbARMPlugin \
CroquetPlugin \
-FloatArrayPlugin \
-FloatMathPlugin \
+MIDIPlugin \
Mpeg3Plugin \
SqueakFFIPrims \
SqueakSSL \
-UUIDPlugin \
UnixOSProcessPlugin
Modified: branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int
===================================================================
--- branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int 2016-05-04 18:45:02 UTC (rev 3694)
@@ -11,6 +11,8 @@
DSAPrims \
FFTPlugin \
FilePlugin \
+FloatArrayPlugin \
+FloatMathPlugin \
HostWindowPlugin \
IA32ABI \
JPEGReaderPlugin \
@@ -18,7 +20,6 @@
Klatt \
LargeIntegers \
LocalePlugin \
-MacMenubarPlugin \
Matrix2x3Plugin \
MiscPrimitivePlugin \
RePlugin \
@@ -29,9 +30,10 @@
SoundPlugin \
StarSqueakPlugin \
SurfacePlugin \
+UUIDPlugin \
VMProfileMacSupportPlugin \
# B3DAcceleratorPlugin \
# InternetConfigPlugin \
# JoystickTabletPlugin \
-# MIDIPlugin \
-# SerialPlugin
+# MacMenubarPlugin # Does not work under Cocoa \
+# SerialPlugin # Does not compile under 64-bits
Modified: branches/Cog/build.macos64x64/squeak.stack.spur/plugins.ext
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/plugins.ext 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/plugins.ext 2016-05-04 18:45:02 UTC (rev 3694)
@@ -1,11 +1,9 @@
# Copied, perhaps edited, from ../src/examplePlugins.ext
+# MIDIPlugin does not work on Cocoa so keep it external until it can be fixed.
EXTERNAL_PLUGINS = \
-BochsIA32Plugin \
CroquetPlugin \
-FloatArrayPlugin \
-FloatMathPlugin \
+MIDIPlugin \
Mpeg3Plugin \
SqueakFFIPrims \
SqueakSSL \
-UUIDPlugin \
UnixOSProcessPlugin
Modified: branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int 2016-05-03 22:17:47 UTC (rev 3693)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int 2016-05-04 18:45:02 UTC (rev 3694)
@@ -11,6 +11,8 @@
DSAPrims \
FFTPlugin \
FilePlugin \
+FloatArrayPlugin \
+FloatMathPlugin \
HostWindowPlugin \
IA32ABI \
JPEGReaderPlugin \
@@ -18,7 +20,6 @@
Klatt \
LargeIntegers \
LocalePlugin \
-MacMenubarPlugin \
Matrix2x3Plugin \
MiscPrimitivePlugin \
RePlugin \
@@ -29,9 +30,10 @@
SoundPlugin \
StarSqueakPlugin \
SurfacePlugin \
+UUIDPlugin \
VMProfileMacSupportPlugin \
# B3DAcceleratorPlugin \
# InternetConfigPlugin \
# JoystickTabletPlugin \
-# MIDIPlugin \
-# SerialPlugin
+# MacMenubarPlugin # Does not work under Cocoa \
+# SerialPlugin # Does not compile under 64-bits
Added: branches/Cog/platforms/iOS/plugins/MIDIPlugin/Makefile
===================================================================
--- branches/Cog/platforms/iOS/plugins/MIDIPlugin/Makefile (rev 0)
+++ branches/Cog/platforms/iOS/plugins/MIDIPlugin/Makefile 2016-05-04 18:45:02 UTC (rev 3694)
@@ -0,0 +1,7 @@
+# eem 2016/5/4 The existing code is in terms of oplder pre-carbon APIs and the
+# Component Manager, which was deprecated in 10.8 and no longer seems available.
+# To get the code to link we therefore have to use -undefined dynamic_lookup
+
+EXTRALIBS:=-undefined dynamic_lookup -framework AudioToolbox -framework CoreAudio -framework QuickTime
+
+include ../common/Makefile.plugin
More information about the Vm-dev
mailing list