Windows MSVC build. The VMLIB must be provided to external plugins if…

… they are to use sqAssert.h. [ci skip]
OpenSmalltalk · Apr 2, 2020 · 8d21692 · 8d21692
1 parent dfc7542
commit 8d21692
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/build.win32x86/common/Makefile.msvc b/build.win32x86/common/Makefile.msvc
@@ -269,7 +269,7 @@ $(OBJDIR)/%.dll: $(call plugin-makefile,$(*F))
 		CONFIGURATION=$(CONFIGURATION) ARCH=$(ARCH) TOOLPREFIX=$(TOOLPREFIX) \
 		PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \
 		THIRDPARTYOUTDIR=$(THIRDPARTYOUTDIR) XDEFS=-DSQUEAK_EXTERNAL_PLUGIN \
-		COGDEFS="$(COGDEFS)" LIBNAME=$(*F) $(OBJDIR)/$(*F).dll
+		COGDEFS="$(COGDEFS)" LIBNAME=$(*F) VMLIB=$(VMLIB) $(OBJDIR)/$(*F).dll
 
 #############################################################################
 # Basic rules

diff --git a/build.win32x86/common/Makefile.msvc.plugin b/build.win32x86/common/Makefile.msvc.plugin
@@ -109,6 +109,7 @@ print-settings:
 	$(info 'LIBOBJ=$(LIBOBJ)')
 	$(info 'OBJDIR=$(OBJDIR)')
 	$(info 'VMDIR=$(VMDIR)')
+	$(info 'VMLIB=$(VMLIB)')
 	$(info 'PLUGINSRCDIR=$(PLUGINSRCDIR)')
 	$(info 'PLUGINLIB=$(PLUGINLIB)')
 	$(info 'PLUGINDLL=$(PLUGINDLL)')
@@ -127,5 +128,11 @@ $(PLUGINLIB): $(VMDIR) $(OBJDIR) $(LIBOBJ)
 	$(LIBRARIAN) $(LIBOBJ) $(EXTRALIBS) /out:$(subst /,\\,$(PLUGINLIB))
 
 $(PLUGINDLL): $(VMDIR) $(OBJDIR) $(LIBOBJ)
-	$(LD) WinMM.lib ole32.lib dsound.lib msdmo.lib kernel32.lib $(LDFLAGS) /DLL $(LIBOBJ) $(EXTRALIBS) /LIBPATH:"$(WindowsSdkDir)LIB/$(WindowsSDKVersion)/um/x86" /LIBPATH:"$(WindowsSdkDir)LIB/$(WindowsSDKVersion)/ucrt/x86" /LIBPATH:"$(VCToolsInstallDir)/lib/x86/" $(EXTRALIBPATH) /LIBPATH:"../../platforms/win32/third-party/dx9sdk/Lib" /OUT:$(subst /,\\,$(PLUGINDLL))
+	$(LD) WinMM.lib ole32.lib dsound.lib msdmo.lib kernel32.lib $(VMLIB) $(LDFLAGS) /DLL $(LIBOBJ) $(EXTRALIBS) \
+	/LIBPATH:$(BUILD)/vm \
+	/LIBPATH:"$(WindowsSdkDir)LIB/$(WindowsSDKVersion)/um/x86" \
+	/LIBPATH:"$(WindowsSdkDir)LIB/$(WindowsSDKVersion)/ucrt/x86" \
+	/LIBPATH:"$(VCToolsInstallDir)/lib/x86/" $(EXTRALIBPATH) \
+	/LIBPATH:"../../platforms/win32/third-party/dx9sdk/Lib" \
+	/OUT:$(subst /,\\,$(PLUGINDLL))
 
diff --git a/build.win64x64/common/Makefile.msvc b/build.win64x64/common/Makefile.msvc
@@ -267,7 +267,7 @@ $(OBJDIR)/%.dll: $(call plugin-makefile,$(*F))
 		CONFIGURATION=$(CONFIGURATION) ARCH=$(ARCH) TOOLPREFIX=$(TOOLPREFIX) \
 		PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \
 		THIRDPARTYOUTDIR=$(THIRDPARTYOUTDIR) XDEFS=-DSQUEAK_EXTERNAL_PLUGIN \
-		COGDEFS="$(COGDEFS)" LIBNAME=$(*F) $(OBJDIR)/$(*F).dll
+		COGDEFS="$(COGDEFS)" LIBNAME=$(*F) VMLIB=$(VMLIB) $(OBJDIR)/$(*F).dll
 
 #############################################################################
 # Basic rules

diff --git a/build.win64x64/common/Makefile.msvc.plugin b/build.win64x64/common/Makefile.msvc.plugin
@@ -108,6 +108,7 @@ print-settings:
 	$(info 'LIBOBJ=$(LIBOBJ)')
 	$(info 'OBJDIR=$(OBJDIR)')
 	$(info 'VMDIR=$(VMDIR)')
+	$(info 'VMLIB=$(VMLIB)')
 	$(info 'PLUGINSRCDIR=$(PLUGINSRCDIR)')
 	$(info 'PLUGINLIB=$(PLUGINLIB)')
 	$(info 'PLUGINDLL=$(PLUGINDLL)')
@@ -126,5 +127,11 @@ $(PLUGINLIB): $(VMDIR) $(OBJDIR) $(LIBOBJ)
 	$(LIBRARIAN) $(LIBOBJ) $(EXTRALIBS) /out:$(subst /,\\,$(PLUGINLIB))
 
 $(PLUGINDLL): $(VMDIR) $(OBJDIR) $(LIBOBJ)
-	$(LD) WinMM.lib ole32.lib dsound.lib msdmo.lib kernel32.lib $(LDFLAGS) /DLL $(LIBOBJ) $(EXTRALIBS) /LIBPATH:"$(WindowsSdkDir)LIB/$(WindowsSDKVersion)/um/x64" /LIBPATH:"$(WindowsSdkDir)LIB/$(WindowsSDKVersion)/ucrt/x64" /LIBPATH:"$(VCToolsInstallDir)/lib/x64/" $(EXTRALIBPATH) /LIBPATH:"../../platforms/win32/third-party/dx9sdk/Lib" /OUT:$(subst /,\\,$(PLUGINDLL))
+	$(LD) WinMM.lib ole32.lib dsound.lib msdmo.lib kernel32.lib $(VMLIB) $(LDFLAGS) /DLL $(LIBOBJ) $(EXTRALIBS) \
+	/LIBPATH:$(BUILD)/vm \
+	/LIBPATH:"$(WindowsSdkDir)LIB/$(WindowsSDKVersion)/um/x64" \
+	/LIBPATH:"$(WindowsSdkDir)LIB/$(WindowsSDKVersion)/ucrt/x64" \
+	/LIBPATH:"$(VCToolsInstallDir)/lib/x64/" $(EXTRALIBPATH) \
+	/LIBPATH:"../../platforms/win32/third-party/dx9sdk/Lib" \
+	/OUT:$(subst /,\\,$(PLUGINDLL))