Windows builds: Don't define SQUEAK_BUILTIN_PLUGIN via XDEFS when mak…

…ing a plugin since some plugin Makefiles want to use XDEFS to add their own extra defines. [ci skip]
OpenSmalltalk · Apr 16, 2020 · 2d68bda · 2d68bda
1 parent b8384f4
commit 2d68bda
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/build.win32x86/common/Makefile b/build.win32x86/common/Makefile
@@ -274,7 +274,7 @@ $(OBJDIR)/%.lib: $(call plugin-makefile,$(*F))
 		CONFIGURATION=$(CONFIGURATION) TOOLPREFIX=$(TOOLPREFIX) \
 		THIRDPARTYOUTDIR=$(THIRDPARTYOUTDIR) \
 		PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \
-		LIBNAME=$(*F) COGDEFS="$(COGDEFS)" XDEFS=-DSQUEAK_BUILTIN_PLUGIN \
+		LIBNAME=$(*F) COGDEFS="$(COGDEFS) -DSQUEAK_BUILTIN_PLUGIN" \
 		$(OBJDIR)/$(*F).lib
 
 # External plugin.  Build as dll and copy to vm dir ($(OBJDIR)).

diff --git a/build.win32x86/common/Makefile.msvc b/build.win32x86/common/Makefile.msvc
@@ -259,9 +259,9 @@ $(OBJDIR)/%.lib: $(call plugin-makefile,$(*F))
 		-f $(call plugin-makefile,$(*F)) \
 		"VM=$(VM)" "VM_NAME=$(VM_NAME)" \
 		CONFIGURATION=$(CONFIGURATION) ARCH=$(ARCH) TOOLPREFIX=$(TOOLPREFIX) \
-		THIRDPARTYOUTDIR=$(THIRDPARTYOUTDIR) XDEFS=-DSQUEAK_BUILTIN_PLUGIN \
 		PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \
-		COGDEFS="$(COGDEFS)" LIBNAME=$(*F) $(OBJDIR)/$(*F).lib
+		THIRDPARTYOUTDIR=$(THIRDPARTYOUTDIR) \
+		COGDEFS="$(COGDEFS) -DSQUEAK_BUILTIN_PLUGIN" LIBNAME=$(*F) $(OBJDIR)/$(*F).lib
 
 # External plugin.  Build as dll and copy to vm dir ($(OBJDIR)).
 $(OBJDIR)/%.dll: $(call plugin-makefile,$(*F))
@@ -272,7 +272,7 @@ $(OBJDIR)/%.dll: $(call plugin-makefile,$(*F))
 		"VM=$(VM)" "VM_NAME=$(VM_NAME)" \
 		CONFIGURATION=$(CONFIGURATION) ARCH=$(ARCH) TOOLPREFIX=$(TOOLPREFIX) \
 		PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \
-		THIRDPARTYOUTDIR=$(THIRDPARTYOUTDIR) XDEFS=-DSQUEAK_EXTERNAL_PLUGIN \
+		THIRDPARTYOUTDIR=$(THIRDPARTYOUTDIR) \
 		COGDEFS="$(COGDEFS)" LIBNAME=$(*F) VMLIB=$(VMLIB) $(OBJDIR)/$(*F).dll
 
 #############################################################################

diff --git a/build.win64x64/common/Makefile b/build.win64x64/common/Makefile
@@ -274,7 +274,7 @@ $(OBJDIR)/%.lib: $(call plugin-makefile,$(*F))
 		CONFIGURATION=$(CONFIGURATION) TOOLPREFIX=$(TOOLPREFIX) \
 		THIRDPARTYOUTDIR=$(THIRDPARTYOUTDIR) \
 		PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \
-		LIBNAME=$(*F) COGDEFS="$(COGDEFS)" XDEFS=-DSQUEAK_BUILTIN_PLUGIN \
+		LIBNAME=$(*F) COGDEFS="$(COGDEFS) -DSQUEAK_BUILTIN_PLUGIN" \
 		$(OBJDIR)/$(*F).lib
 
 # External plugin.  Build as dll and copy to vm dir ($(OBJDIR)).

diff --git a/build.win64x64/common/Makefile.msvc b/build.win64x64/common/Makefile.msvc
@@ -257,9 +257,9 @@ $(OBJDIR)/%.lib: $(call plugin-makefile,$(*F))
 		-f $(call plugin-makefile,$(*F)) \
 		"VM=$(VM)" "VM_NAME=$(VM_NAME)" \
 		CONFIGURATION=$(CONFIGURATION) ARCH=$(ARCH) TOOLPREFIX=$(TOOLPREFIX) \
-		THIRDPARTYOUTDIR=$(THIRDPARTYOUTDIR) XDEFS=-DSQUEAK_BUILTIN_PLUGIN \
 		PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \
-		COGDEFS="$(COGDEFS)" LIBNAME=$(*F) $(OBJDIR)/$(*F).lib
+		THIRDPARTYOUTDIR=$(THIRDPARTYOUTDIR) \
+		COGDEFS="$(COGDEFS) -DSQUEAK_BUILTIN_PLUGIN" LIBNAME=$(*F) $(OBJDIR)/$(*F).lib
 
 # External plugin.  Build as dll and copy to vm dir ($(OBJDIR)).
 $(OBJDIR)/%.dll: $(call plugin-makefile,$(*F))
@@ -270,7 +270,7 @@ $(OBJDIR)/%.dll: $(call plugin-makefile,$(*F))
 		"VM=$(VM)" "VM_NAME=$(VM_NAME)" \
 		CONFIGURATION=$(CONFIGURATION) ARCH=$(ARCH) TOOLPREFIX=$(TOOLPREFIX) \
 		PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \
-		THIRDPARTYOUTDIR=$(THIRDPARTYOUTDIR) XDEFS=-DSQUEAK_EXTERNAL_PLUGIN \
+		THIRDPARTYOUTDIR=$(THIRDPARTYOUTDIR) \
 		COGDEFS="$(COGDEFS)" LIBNAME=$(*F) VMLIB=$(VMLIB) $(OBJDIR)/$(*F).dll
 
 #############################################################################