From 691f53959e3ec034cedcd15c3f7044a141b42878 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 19 Aug 2011 17:22:14 +0300 Subject: Use -NODEFAULTLIB for dbgutil build and link with kernel32 and user32 This avoids warnings about linking both with normal and debugging runtime. Matches more closely what the old build system does. --- solenv/gbuild/platform/windows.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 875b43195aea..6ca1178e085d 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -383,11 +383,12 @@ $(call gb_Helper_abbreviate_dirs_native,\ $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ $(if $(filter YES,$(gb_Executable_TARGETGUI)), -SUBSYSTEM:WINDOWS, -SUBSYSTEM:CONSOLE) \ $(T_LDFLAGS) \ + $(if $(gb_PRODUCT),,-NODEFAULTLIB) \ @$${RESPONSEFILE} \ $(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_filename,$(lib))) \ $(LIBS) \ - $(if $(gb_PRODUCT),,msvcrtd.lib msvcprtd.lib) \ + $(if $(gb_PRODUCT),,msvcrtd.lib msvcprtd.lib kernel32.lib user32.lib) \ $(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); RC=$$?; rm $${RESPONSEFILE} \ $(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) ; exit $$RC) endef -- cgit