[Gd-chatter] r10721 - trunk/fundev/sources/lib/run-time/pentium-win32

[housel at gwydiondylan.org]

Author: housel
Date: Wed May 10 08:00:59 2006
New Revision: 10721

Modified:
   trunk/fundev/sources/lib/run-time/pentium-win32/x86-win32-vc6-build.jam
Log:
Bug: 7311 7003

Win32 build script changes.

* fundev/sources/lib/run-time/pentium-win32/x86-win32-vc6-build.jam
  (rtlibs): Use the new redistributable import library for the MSVC runtime.
  (LinkDLL, LinkEXE) Replace "$(<)" with @"$(<:Q@)" (similarly with NEEDLIBS)
  to prevent the link command line from overflowing.


Modified: trunk/fundev/sources/lib/run-time/pentium-win32/x86-win32-vc6-build.jam
==============================================================================
--- trunk/fundev/sources/lib/run-time/pentium-win32/x86-win32-vc6-build.jam	(original)
+++ trunk/fundev/sources/lib/run-time/pentium-win32/x86-win32-vc6-build.jam	Wed May 10 08:00:59 2006
@@ -47,8 +47,8 @@
 
 # External libraries linked with the dylan library
 # (via the Linker-Options: keyword in Sources/dylan/dylan.lid)
-rtlibs  ?= kernel32.lib mincrt.lib pentium-run-time.lib
-	   mmdw.lib mpsplinth.lib ;
+rtlibs  ?= kernel32.lib pentium-run-time.lib mmdw.lib mpsplinth.lib 
+           minvcrt.lib ;
 
 # External libraries linked with libraries other than the dylan library
 # (via the DylanLibrary function defined below)
@@ -392,7 +392,7 @@
 }
 
 actions together LinkDLL bind NEEDLIBS {
-  $(LINK) /DLL /OUT:"$(<[1])" /IMPLIB:"$(<[2])" $(LINKFLAGS) /BASE:$(BASE) /VERSION:$(VERSION) /ENTRY:$(ENTRY) "$(>)" /LIBPATH:"$(LIBPATH)" "$(NEEDLIBS)" $(LINKLIBS)
+  $(LINK) /DLL /OUT:"$(<[1])" /IMPLIB:"$(<[2])" $(LINKFLAGS) /BASE:$(BASE) /VERSION:$(VERSION) /ENTRY:$(ENTRY) @"$(>:Q@)" /LIBPATH:"$(LIBPATH)" @"$(NEEDLIBS:Q@)" $(LINKLIBS)
 }
 
 rule LinkEXE {
@@ -400,7 +400,7 @@
 }
 
 actions together LinkEXE bind NEEDLIBS {
-  $(LINK) /RELEASE /OUT:"$(<)" /SUBSYSTEM:CONSOLE,4.0 $(LINKFLAGS) /VERSION:$(VERSION) /ENTRY:$(ENTRY) "$(>)" /LIBPATH:"$(LIBPATH)" "$(NEEDLIBS)" "$(LINKLIBS)"
+  $(LINK) /RELEASE /OUT:"$(<)" /SUBSYSTEM:CONSOLE,4.0 $(LINKFLAGS) /VERSION:$(VERSION) /ENTRY:$(ENTRY) @"$(>:Q@)" /LIBPATH:"$(LIBPATH)" @"$(NEEDLIBS:Q@)" "$(LINKLIBS)"
 }
 
 rule RC {