[Vm-dev] [commit][2960] win32 Cog makefiles should define COGDEFS in Makefile.plugin , even if its null.

[commits at squeakvm.org]

Revision: 2960
Author:   eliot
Date:     2014-06-08 12:42:42 -0700 (Sun, 08 Jun 2014)
Log Message:
-----------
win32 Cog makefiles should define COGDEFS in Makefile.plugin, even if its null.

Modified Paths:
--------------
    branches/Cog/build.win32x86/newspeak.cog.spur/Makefile
    branches/Cog/build.win32x86/newspeak.cog.v3/Makefile
    branches/Cog/build.win32x86/newspeak.stack.spur/Makefile
    branches/Cog/build.win32x86/newspeak.stack.v3/Makefile

Modified: branches/Cog/build.win32x86/newspeak.cog.spur/Makefile
===================================================================
--- branches/Cog/build.win32x86/newspeak.cog.spur/Makefile	2014-06-08 19:17:36 UTC (rev 2959)
+++ branches/Cog/build.win32x86/newspeak.cog.spur/Makefile	2014-06-08 19:42:42 UTC (rev 2960)
@@ -284,7 +284,7 @@
 		-f../../$(shell ./eitheror.exe $(PLATDIR)/win32/plugins/$(*F)/Makefile Makefile.plugin) \
 		PLATDIR=../../$(PLATDIR) BASEDIR=../../$(BASEDIR) \
 		PLUGINSRCDIR=../../$(PLUGINSRCDIR) VMSRCDIR=../../$(VMSRCDIR) \
-		LIBNAME=$(*F) XDEFS=-DSQUEAK_BUILTIN_PLUGIN \
+		COGDEFS="" LIBNAME=$(*F) XDEFS=-DSQUEAK_BUILTIN_PLUGIN \
 		../../$(OBJDIR)/$(*F).lib
 
 # External plugin.  Build as dll and copy to vm dir ($(OBJDIR)).
@@ -295,7 +295,7 @@
 		-f../../$(shell ./eitheror.exe $(PLATDIR)/win32/plugins/$(*F)/Makefile Makefile.plugin) \
 		PLATDIR=../../$(PLATDIR) BASEDIR=../../$(BASEDIR) \
 		PLUGINSRCDIR=../../$(PLUGINSRCDIR) VMSRCDIR=../../$(VMSRCDIR) \
-		LIBNAME=$(*F) ../../$(OBJDIR)/$(*F).dll
+		COGDEFS="" LIBNAME=$(*F) ../../$(OBJDIR)/$(*F).dll
 
 FORCE:
 

Modified: branches/Cog/build.win32x86/newspeak.cog.v3/Makefile
===================================================================
--- branches/Cog/build.win32x86/newspeak.cog.v3/Makefile	2014-06-08 19:17:36 UTC (rev 2959)
+++ branches/Cog/build.win32x86/newspeak.cog.v3/Makefile	2014-06-08 19:42:42 UTC (rev 2960)
@@ -284,7 +284,7 @@
 		-f../../$(shell ./eitheror.exe $(PLATDIR)/win32/plugins/$(*F)/Makefile Makefile.plugin) \
 		PLATDIR=../../$(PLATDIR) BASEDIR=../../$(BASEDIR) \
 		PLUGINSRCDIR=../../$(PLUGINSRCDIR) VMSRCDIR=../../$(VMSRCDIR) \
-		LIBNAME=$(*F) XDEFS=-DSQUEAK_BUILTIN_PLUGIN \
+		COGDEFS="" LIBNAME=$(*F) XDEFS=-DSQUEAK_BUILTIN_PLUGIN \
 		../../$(OBJDIR)/$(*F).lib
 
 # External plugin.  Build as dll and copy to vm dir ($(OBJDIR)).
@@ -295,7 +295,7 @@
 		-f../../$(shell ./eitheror.exe $(PLATDIR)/win32/plugins/$(*F)/Makefile Makefile.plugin) \
 		PLATDIR=../../$(PLATDIR) BASEDIR=../../$(BASEDIR) \
 		PLUGINSRCDIR=../../$(PLUGINSRCDIR) VMSRCDIR=../../$(VMSRCDIR) \
-		LIBNAME=$(*F) ../../$(OBJDIR)/$(*F).dll
+		COGDEFS="" LIBNAME=$(*F) ../../$(OBJDIR)/$(*F).dll
 
 FORCE:
 

Modified: branches/Cog/build.win32x86/newspeak.stack.spur/Makefile
===================================================================
--- branches/Cog/build.win32x86/newspeak.stack.spur/Makefile	2014-06-08 19:17:36 UTC (rev 2959)
+++ branches/Cog/build.win32x86/newspeak.stack.spur/Makefile	2014-06-08 19:42:42 UTC (rev 2960)
@@ -285,7 +285,7 @@
 		-f../../$(shell ./eitheror.exe $(PLATDIR)/win32/plugins/$(*F)/Makefile Makefile.plugin) \
 		PLATDIR=../../$(PLATDIR) BASEDIR=../../$(BASEDIR) \
 		PLUGINSRCDIR=../../$(PLUGINSRCDIR) VMSRCDIR=../../$(VMSRCDIR) \
-		LIBNAME=$(*F) XDEFS=-DSQUEAK_BUILTIN_PLUGIN \
+		COGDEFS="" LIBNAME=$(*F) XDEFS=-DSQUEAK_BUILTIN_PLUGIN \
 		../../$(OBJDIR)/$(*F).lib
 
 # External plugin.  Build as dll and copy to vm dir ($(OBJDIR)).
@@ -296,7 +296,7 @@
 		-f../../$(shell ./eitheror.exe $(PLATDIR)/win32/plugins/$(*F)/Makefile Makefile.plugin) \
 		PLATDIR=../../$(PLATDIR) BASEDIR=../../$(BASEDIR) \
 		PLUGINSRCDIR=../../$(PLUGINSRCDIR) VMSRCDIR=../../$(VMSRCDIR) \
-		LIBNAME=$(*F) ../../$(OBJDIR)/$(*F).dll
+		COGDEFS="" LIBNAME=$(*F) ../../$(OBJDIR)/$(*F).dll
 
 FORCE:
 

Modified: branches/Cog/build.win32x86/newspeak.stack.v3/Makefile
===================================================================
--- branches/Cog/build.win32x86/newspeak.stack.v3/Makefile	2014-06-08 19:17:36 UTC (rev 2959)
+++ branches/Cog/build.win32x86/newspeak.stack.v3/Makefile	2014-06-08 19:42:42 UTC (rev 2960)
@@ -285,7 +285,7 @@
 		-f../../$(shell ./eitheror.exe $(PLATDIR)/win32/plugins/$(*F)/Makefile Makefile.plugin) \
 		PLATDIR=../../$(PLATDIR) BASEDIR=../../$(BASEDIR) \
 		PLUGINSRCDIR=../../$(PLUGINSRCDIR) VMSRCDIR=../../$(VMSRCDIR) \
-		LIBNAME=$(*F) XDEFS=-DSQUEAK_BUILTIN_PLUGIN \
+		COGDEFS="" LIBNAME=$(*F) XDEFS=-DSQUEAK_BUILTIN_PLUGIN \
 		../../$(OBJDIR)/$(*F).lib
 
 # External plugin.  Build as dll and copy to vm dir ($(OBJDIR)).
@@ -296,7 +296,7 @@
 		-f../../$(shell ./eitheror.exe $(PLATDIR)/win32/plugins/$(*F)/Makefile Makefile.plugin) \
 		PLATDIR=../../$(PLATDIR) BASEDIR=../../$(BASEDIR) \
 		PLUGINSRCDIR=../../$(PLUGINSRCDIR) VMSRCDIR=../../$(VMSRCDIR) \
-		LIBNAME=$(*F) ../../$(OBJDIR)/$(*F).dll
+		COGDEFS="" LIBNAME=$(*F) ../../$(OBJDIR)/$(*F).dll
 
 FORCE: