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

 
Revision: 3578
Author:   eliot
Date:     2016-02-10 11:05:51 -0800 (Wed, 10 Feb 2016)
Log Message:
-----------
Mac OS X gnu makefiles:
Make clear the distinction between SRCDIRS (dirs searched for source
files to compile) and INCDIRS (dirs searched for include files) in
plugins.
Make sure getversion is built before invoking Makefile.plugin.

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

Added Paths:
-----------
    branches/Cog/platforms/iOS/plugins/Mpeg3Plugin/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 18:09:25 UTC (rev 3577)
+++ branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-10 19:05:51 UTC (rev 3578)
@@ -46,17 +46,16 @@
 OSXVMDIR:=$(PLATDIR)/iOS/vm/OSX
 MAKERVMDIR:=$(VMSRCDIR)
 
-SRCDIRS:= $(MAKERVMDIR) $(CROSSVMDIR) $(MAKERDIR) $(OSXPLGDIR) $(OSXVMDIR) $(CROSSDIR) $(SRCDIRS)
-INCLUDES:= $(addprefix -I,. $(SRCDIRS)) $(INCLUDES)
+# INCDIRS are where include files are searched for. A superset of SRCDIRS.
+INCDIRS:= $(MAKERVMDIR) $(CROSSVMDIR) $(MAKERDIR) $(OSXPLGDIR) $(OSXVMDIR) $(CROSSDIR) $(INCDIRS)
+INCLUDES:= $(addprefix -I,. $(INCDIRS)) $(INCLUDES)
 
 #############################################################################
 # If no source files were given, use standard set
 #
 
-CROSSSRC:= $(wildcard $(CROSSDIR)/*.c) $(wildcard $(CROSSDIR)/*.cpp)
-OSXSRC:= $(wildcard $(OSXPLGDIR)/*.c) $(wildcard $(OSXPLGDIR)/*.m) $(wildcard $(OSXPLGDIR)/*.cpp)
-MAKERSRC:= $(wildcard $(MAKERDIR)/*.c)
-LIBSRC?= $(notdir $(MAKERSRC) $(OSXSRC) $(CROSSSRC))
+SRCDIRS:=$(SRCDIRS) $(MAKERDIR) $(CROSSDIR) $(OSXPLGDIR)
+LIBSRC?= $(foreach d,$(SRCDIRS),$(wildcard $(d)/*.c) $(wildcard $(d)/*.cpp) $(wildcard $(d)/*.m))
 
 
 #############################################################################
@@ -81,7 +80,8 @@
 # https://developer.apple.com/library/ios/documentation/General/Reference/InfoPlistKeyReference/Introduction/Introduction.html
 PLUGINPLIST:= $(PLUGINBUNDLE)/Contents/Info.plist
 PLUGINICONS:= $(PLUGINBUNDLE)/Contents/Resources/SqueakPlugin.icns
-LIBOBJ?=$(patsubst %.c,%.o,$(patsubst %.m,%.o,$(patsubst %.cpp,%.o,$(LIBSRC))))
+LIBOBJ?=$(notdir $(LIBSRC))
+LIBOBJ:=$(patsubst %.c,%.o,$(patsubst %.m,%.o,$(patsubst %.cpp,%.o,$(LIBOBJ))))
 LIBOBJ:=$(addprefix $(OBJDIR)/,$(LIBOBJ))
 
 VPATH:= $(SRCDIRS)
@@ -108,6 +108,7 @@
  @echo CROSSSRC=$(CROSSSRC)
  @echo OSXSRC=$(OSXSRC)
  @echo MAKERSRC=$(MAKERSRC)
+ @echo SRCDIRS=$(SRCDIRS)
  @echo LIBSRC=$(LIBSRC)
  @echo LIBOBJ=$(LIBOBJ)
  @echo OBJDIR=$(OBJDIR)

Modified: branches/Cog/build.macos32x86/common/Makefile.vm
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-10 18:09:25 UTC (rev 3577)
+++ branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-10 19:05:51 UTC (rev 3578)
@@ -210,7 +210,7 @@
 # Internal plugin.  Build as lib then link in lib
 # Check for Makefile in iOS plugins directory otherwise use default Makefile
 # N.B.  PLATDIR *must* be a relative path for this to work
-$(OBJDIR)/%.lib: FORCE
+$(OBJDIR)/%.lib: getversion FORCE
  @-mkdir -p $(BLDDIR)/$(*F)
  $(MAKE) $(MFLAGS) BUILD=$(BUILD) \
  -f $(shell test -f $(OSXPLUGINSDIR)/$(*F)/Makefile && echo $(OSXPLUGINSDIR)/$(*F)/Makefile || echo $(COMMONDIR)/Makefile.plugin) \
@@ -222,7 +222,7 @@
 
 # External plugin.  Build as bundle and copy to vm dir ($(OBJDIR)).
 # Check for Makefile in iOS plugins directory otherwise use default Makefile
-$(OBJDIR)/%.bundle: FORCE
+$(OBJDIR)/%.bundle: getversion FORCE
  @-mkdir -p $(BLDDIR)/$(*F)
  $(MAKE) $(MFLAGS) BUILD=$(BUILD) \
  -f $(shell test -f $(OSXPLUGINSDIR)/$(*F)/Makefile && echo $(OSXPLUGINSDIR)/$(*F)/Makefile || echo $(COMMONDIR)/Makefile.plugin) \


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

Copied: branches/Cog/platforms/iOS/plugins/Mpeg3Plugin/Makefile (from rev 3576, branches/Cog/platforms/iOS/plugins/AioPlugin/Makefile)
===================================================================
--- branches/Cog/platforms/iOS/plugins/Mpeg3Plugin/Makefile                        (rev 0)
+++ branches/Cog/platforms/iOS/plugins/Mpeg3Plugin/Makefile 2016-02-10 19:05:51 UTC (rev 3578)
@@ -0,0 +1,7 @@
+INCDIRS:=../../platforms/Cross/plugins/Mpeg3Plugin/libmpeg \
+         ../../platforms/Cross/plugins/Mpeg3Plugin/libmpeg/audio \
+         ../../platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video
+
+SRCDIRS:=$(INCDIRS)
+
+include ../common/Makefile.plugin

Modified: branches/Cog/platforms/iOS/plugins/SocketPlugin/Makefile
===================================================================
--- branches/Cog/platforms/iOS/plugins/SocketPlugin/Makefile 2016-02-10 18:09:25 UTC (rev 3577)
+++ branches/Cog/platforms/iOS/plugins/SocketPlugin/Makefile 2016-02-10 19:05:51 UTC (rev 3578)
@@ -1,6 +1,6 @@
 SRCDIRS:=../../platforms/unix/plugins/SocketPlugin
-INCLUDES:=-I../../platforms/Cross/plugins/SocketPlugin \
-          -I../../platforms/unix/vm
+INCDIRS:=../../platforms/Cross/plugins/SocketPlugin \
+         ../../platforms/unix/vm
 LIBSRC:= SocketPlugin.c sqUnixSocket.c
 LIBOBJ:=SocketPlugin.o sqUnixSocket.o
 

Modified: branches/Cog/platforms/iOS/plugins/SoundPlugin/Makefile
===================================================================
--- branches/Cog/platforms/iOS/plugins/SoundPlugin/Makefile 2016-02-10 18:09:25 UTC (rev 3577)
+++ branches/Cog/platforms/iOS/plugins/SoundPlugin/Makefile 2016-02-10 19:05:51 UTC (rev 3578)
@@ -1,3 +1,3 @@
-INCLUDES:=-I../../platforms/iOS/vm/Common/Classes
+INCDIRS:=../../platforms/iOS/vm/Common/Classes
 
 include ../common/Makefile.plugin