[commit][3579] Mac OS X gnu makefiles:

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[commit][3579] Mac OS X gnu makefiles:

commits-3
 
Revision: 3579
Author:   eliot
Date:     2016-02-10 12:52:25 -0800 (Wed, 10 Feb 2016)
Log Message:
-----------
Mac OS X gnu makefiles:
Fix Mpeg3Plugin by allowing Makefile to supply EXCLUDESRC to filter out
files not to be built.  Fix remaining external plugin link issues.
32-bit pharo.cog.spur now builds.

Modified Paths:
--------------
    branches/Cog/build.macos32x86/common/Makefile.plugin
    branches/Cog/platforms/iOS/plugins/Mpeg3Plugin/Makefile

Added Paths:
-----------
    branches/Cog/platforms/iOS/plugins/SqueakFFIPrims/Makefile
    branches/Cog/platforms/iOS/plugins/SqueakSSL/Makefile
    branches/Cog/platforms/iOS/plugins/UnixOSProcessPlugin/Makefile

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

Modified: branches/Cog/build.macos32x86/common/Makefile.plugin
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-10 19:05:51 UTC (rev 3578)
+++ branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-10 20:52:25 UTC (rev 3579)
@@ -56,6 +56,9 @@
 
 SRCDIRS:=$(SRCDIRS) $(MAKERDIR) $(CROSSDIR) $(OSXPLGDIR)
 LIBSRC?= $(foreach d,$(SRCDIRS),$(wildcard $(d)/*.c) $(wildcard $(d)/*.cpp) $(wildcard $(d)/*.m))
+ifneq ($(EXCLUDESRC),)
+LIBSRC:=$(filter-out $(EXCLUDESRC),$(LIBSRC))
+endif
 
 
 #############################################################################


Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Wed Feb 10 11:03:22 PST 2016
   + Wed Feb 10 12:49:01 PST 2016

Modified: branches/Cog/platforms/iOS/plugins/Mpeg3Plugin/Makefile
===================================================================
--- branches/Cog/platforms/iOS/plugins/Mpeg3Plugin/Makefile 2016-02-10 19:05:51 UTC (rev 3578)
+++ branches/Cog/platforms/iOS/plugins/Mpeg3Plugin/Makefile 2016-02-10 20:52:25 UTC (rev 3579)
@@ -3,5 +3,6 @@
          ../../platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video
 
 SRCDIRS:=$(INCDIRS)
+EXCLUDESRC:=%/dump.c %/dump2.c %/mpeg3toc.c %/mpeg3cat.c %/testaudio.c %/udump.c %/worksheet.c %/test.c
 
 include ../common/Makefile.plugin

Copied: branches/Cog/platforms/iOS/plugins/SqueakFFIPrims/Makefile (from rev 3578, branches/Cog/platforms/iOS/plugins/SocketPlugin/Makefile)
===================================================================
--- branches/Cog/platforms/iOS/plugins/SqueakFFIPrims/Makefile                        (rev 0)
+++ branches/Cog/platforms/iOS/plugins/SqueakFFIPrims/Makefile 2016-02-10 20:52:25 UTC (rev 3579)
@@ -0,0 +1,3 @@
+LIBSRC:=SqueakFFIPrims.c sqFFIPlugin.c sqFFITestFuncs.c sqManualSurface.c
+
+include ../common/Makefile.plugin

Copied: branches/Cog/platforms/iOS/plugins/SqueakSSL/Makefile (from rev 3576, branches/Cog/platforms/iOS/plugins/BochsIA32Plugin/Makefile)
===================================================================
--- branches/Cog/platforms/iOS/plugins/SqueakSSL/Makefile                        (rev 0)
+++ branches/Cog/platforms/iOS/plugins/SqueakSSL/Makefile 2016-02-10 20:52:25 UTC (rev 3579)
@@ -0,0 +1,3 @@
+EXTRALIBS:= -framework CoreFoundation -framework Security -lssl -lcrypto
+
+include ../common/Makefile.plugin

Copied: branches/Cog/platforms/iOS/plugins/UnixOSProcessPlugin/Makefile (from rev 3576, branches/Cog/platforms/iOS/plugins/AioPlugin/Makefile)
===================================================================
--- branches/Cog/platforms/iOS/plugins/UnixOSProcessPlugin/Makefile                        (rev 0)
+++ branches/Cog/platforms/iOS/plugins/UnixOSProcessPlugin/Makefile 2016-02-10 20:52:25 UTC (rev 3579)
@@ -0,0 +1,7 @@
+INCLUDES:=-I../../platforms/Cross/plugins/FilePlugin \
+          -I../../platforms/Cross/plugins/SocketPlugin \
+          -I../../platforms/unix/vm
+
+EXTRALIBS:=-undefined dynamic_lookup
+
+include ../common/Makefile.plugin