comparison make/common/Library.gmk @ 795:6dce6ac0929e

6754862: jdk/src/windows/bin/java_md.c: hardcoded reference to msvcr71.dll 6779412: VS2008 errors compiling jdk sources Summary: Update Makefiles to tolerate newer Visual Studio releases and runtimes. Reviewed-by: ohair
author tbell
date Wed, 14 Jan 2009 21:35:03 -0800
parents 14f50aee4989
children 9053bcc8eef0
comparison
equal deleted inserted replaced
2:b95e761ea87b 3:f3642756149b
177 @$(OBJDIR)/$(LIBRARY).lcf $(OTHER_LCF) $(LDLIBS_COMMON) 177 @$(OBJDIR)/$(LIBRARY).lcf $(OTHER_LCF) $(LDLIBS_COMMON)
178 else # LIBRARY 178 else # LIBRARY
179 # build it into $(OBJDIR) so that the other generated files get put 179 # build it into $(OBJDIR) so that the other generated files get put
180 # there, then copy just the DLL (and MAP file) to the requested directory. 180 # there, then copy just the DLL (and MAP file) to the requested directory.
181 # 181 #
182 # In VS2005 or VS2008 the link command creates a .manifest file that we want
183 # to insert into the linked artifact so we do not need to track it separately.
184 # Use ";#2" for .dll and ";#1" for .exe in the MT command below:
182 $(ACTUAL_LIBRARY):: $(OBJDIR)/$(LIBRARY).lcf 185 $(ACTUAL_LIBRARY):: $(OBJDIR)/$(LIBRARY).lcf
183 @$(prep-target) 186 @$(prep-target)
184 @$(MKDIR) -p $(OBJDIR) 187 @$(MKDIR) -p $(OBJDIR)
185 $(LINK) -dll -out:$(OBJDIR)/$(@F) \ 188 $(LINK) -dll -out:$(OBJDIR)/$(@F) \
186 -map:$(OBJDIR)/$(LIBRARY).map \ 189 -map:$(OBJDIR)/$(LIBRARY).map \
187 $(LFLAGS) @$(OBJDIR)/$(LIBRARY).lcf \ 190 $(LFLAGS) @$(OBJDIR)/$(LIBRARY).lcf \
188 $(OTHER_LCF) $(JAVALIB) $(LDLIBS) 191 $(OTHER_LCF) $(JAVALIB) $(LDLIBS)
192 ifdef MT
193 $(MT) /manifest $(OBJDIR)/$(@F).manifest /outputresource:$(OBJDIR)/$(@F);#2
194 endif
189 $(CP) $(OBJDIR)/$(@F) $@ 195 $(CP) $(OBJDIR)/$(@F) $@
190 $(CP) $(OBJDIR)/$(LIBRARY).map $(@D) 196 $(CP) $(OBJDIR)/$(LIBRARY).map $(@D)
191 $(CP) $(OBJDIR)/$(LIBRARY).pdb $(@D) 197 $(CP) $(OBJDIR)/$(LIBRARY).pdb $(@D)
192 198
193 endif # LIBRARY 199 endif # LIBRARY