[Vm-dev] [commit][3149] Fix compilation of the ThreadedFFIPlugin on win32

commits at squeakvm.org commits at squeakvm.org
Mon Nov 24 22:09:21 UTC 2014


Revision: 3149
Author:   eliot
Date:     2014-11-24 14:09:18 -0800 (Mon, 24 Nov 2014)
Log Message:
-----------
Fix compilation of the ThreadedFFIPlugin on win32

Modified Paths:
--------------
    trunk/platforms/win32/plugins/SqueakFFIPrims/Makefile

Modified: trunk/platforms/win32/plugins/SqueakFFIPrims/Makefile
===================================================================
--- trunk/platforms/win32/plugins/SqueakFFIPrims/Makefile	2014-11-24 20:21:59 UTC (rev 3148)
+++ trunk/platforms/win32/plugins/SqueakFFIPrims/Makefile	2014-11-24 22:09:18 UTC (rev 3149)
@@ -1,7 +1,16 @@
-include ../../Makefile.plugin
-
 # On Cog we use the ThreadedFFIPlugin and need no platform-dependent code
 ifdef COGDEFS
-MAKERSRC:=$(MAKERDIR)/SqueakFFIPrims.c
-LIBSRC:= $(notdir $(MAKERSRC) $(CROSSSRC))
+CROSSDIR:=	$(PLATDIR)/Cross/plugins/$(LIBNAME)
+MAKERDIR:=	$(PLUGINSRCDIR)/plugins/$(LIBNAME)
+OBJDIR:=    $(BASEDIR)/$(BUILD)/$(LIBNAME)
+WIN32DIR:=	$(PLATDIR)/win32/plugins/$(LIBNAME)
+
+%:
+	$(MAKE) -f ../../Makefile.plugin VPATH="$(CROSSDIR) $(MAKERDIR) $(WIN32DIR) $(OBJDIR)" \
+		CROSSSRC="sqFFIPlugin.c sqFFITestFuncs.c sqManualSurface.c" \
+		MAKERSRC="SqueakFFIPrims.c" \
+		WIN32SRC="" \
+		$@
+else
+include ../../Makefile.plugin
 endif



More information about the Vm-dev mailing list