Skip to content

Commit

Permalink
Twak MSVC Wndows makefiles to specify import libs in external plugin …
Browse files Browse the repository at this point in the history
…link in

a more logical order. [ci skip]
  • Loading branch information
eliotmiranda committed Apr 10, 2020
1 parent dc72ba5 commit 826cfc7
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions build.win64x64/common/Makefile.msvc.plugin
Expand Up @@ -105,6 +105,7 @@ print-settings:
$(info 'PLUGINSRCDIR=$(PLUGINSRCDIR)')
$(info 'PLUGINLIB=$(PLUGINLIB)')
$(info 'PLUGINDLL=$(PLUGINDLL)')
$(info 'PLUGINDLL_LIBS=$(PLUGINDLL_LIBS)')
$(info 'XINC=$(XINC)')
$(info 'XDEFS=$(XDEFS)')
$(info -----------------------------------------------------)
Expand All @@ -119,12 +120,17 @@ $(PLUGINLIB): $(VMDIR) $(OBJDIR) $(LIBOBJ)
-$(RM) $(PLUGINLIB)
$(LIBRARIAN) $(LIBOBJ) $(EXTRALIBS) -out:$(subst /,\\,$(PLUGINLIB))

PLUGINDLL_LIBS:=WinMM.lib ole32.lib dsound.lib msdmo.lib kernel32.lib

ifdef Clang
PLUGINDLL_LIBS+=libconcrt.lib /NODEFAULTLIB:msvcrt.lib
endif

$(PLUGINDLL): $(VMDIR) $(OBJDIR) $(LIBOBJ)
$(LD) WinMM.lib ole32.lib dsound.lib msdmo.lib kernel32.lib $(VMLIB) $(LDFLAGS) -DLL $(LIBOBJ) $(EXTRALIBS) \
$(LD) $(VMLIB) $(LDFLAGS) -DLL $(LIBOBJ) $(PLUGINDLL_LIBS) $(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))

0 comments on commit 826cfc7

Please sign in to comment.