Require fullcrt win32

.gitignore

@@ -22,8 +22,6 @@ Makefile
 /sources/lib/run-time/dylan-plinth.lib
 /sources/lib/run-time/dylan-support.lib
 /sources/lib/run-time/heap-*.obj
-/sources/lib/run-time/minvcrt.exp
-/sources/lib/run-time/minvcrt.lib
 /sources/lib/run-time/mpsiowin32.obj
 /sources/lib/run-time/obj-*
 /sources/lib/run-time/pentium-run-time.lib

admin/builds/build-release.bat

@@ -43,8 +43,6 @@ echo -     /statistics
 echo -       Turns on a reasonable default set of statistics [default: none]
 echo -     /debugger
 echo -       Runs the builds under batch-debug [default: no debugging]
-echo -     /fullcrt
-echo -       will build the pentium run time using full version of the C runtime
 echo -     /verbose
 echo -       Show more information during building
 echo - 
@@ -122,7 +120,6 @@ set STRIP_RUNTIME=no
 set OLD_RUNTIME_PREFIX=D3
 set RUNTIME_PREFIX=Dx
 set USE_ENVIRONMENT=yes
-set USE_FULL_C_RUNTIME=no
 set VERBOSE=no
 
 set OPEN_DYLAN_USER_SOURCES=
@@ -181,8 +178,6 @@ if "%1"=="-internal"           GOTO SET_INTERNAL
 if "%1"=="/internal"           GOTO SET_INTERNAL
 if "%1"=="-external"           GOTO SET_EXTERNAL
 if "%1"=="/external"           GOTO SET_EXTERNAL
-if "%1"=="-fullcrt"            GOTO SET_FULLCRT
-if "%1"=="/fullcrt"            GOTO SET_FULLCRT
 if "%1%"=="/verbose"           GOTO SET_VERBOSE
 if "%1%"=="-verbose"           GOTO SET_VERBOSE
 set ERROR_MESSAGE=Invalid command line argument %1
@@ -322,11 +317,6 @@ set WARNINGS=yes
 shift
 goto PARAM_LOOP
 
-:SET_FULLCRT
-set USE_FULL_C_RUNTIME=yes
-shift
-goto PARAM_LOOP
-
 :SET_VERBOSE
 set VERBOSE=yes
 shift
@@ -366,9 +356,6 @@ set OPEN_DYLAN_TARGET_PLATFORM=x86-win32
 REM // Pentium runtime build options
 set PENTIUM_RUNTIME_OPTIONS=
 set QUOTED_PENTIUM_RUNTIME_OPTIONS=
-if "%USE_FULL_C_RUNTIME%"=="no" goto setup_build_options
-set PENTIUM_RUNTIME_OPTIONS=%PENTIUM_RUNTIME_OPTIONS% fullcrt=yes
-set QUOTED_PENTIUM_RUNTIME_OPTIONS=PENTIUM_RUNTIME_OPTIONS="%PENTIUM_RUNTIME_OPTIONS%"
 
 REM // Build options
 :SETUP_BUILD_OPTIONS

sources/common-dylan/win32-common-dylan.lid

@@ -29,7 +29,6 @@ Files: library
        machine-words/double
        machine-words/unsigned-double
 C-Source-Files: timer_helpers.c
-C-Libraries:  $(libcmt)
 Copyright:    Original Code is Copyright (c) 1995-2004 Functional Objects, Inc.
               All rights reserved.
 License:      See License.txt in this distribution for details.

sources/jamfiles/x86-win32-vc6-build.jam

@@ -47,17 +47,17 @@ LINKFLAGS ?= /NODEFAULTLIB
 # Runtime
 #
 
+libcmt	?= libcmt.lib ;
+
 # External libraries linked with the dylan library
 # (via the Linker-Options: keyword in Sources/dylan/dylan.lid)
 rtlibs  ?= kernel32.lib pentium-run-time.lib mmdw.lib mpsplinth.lib 
-           minvcrt.lib ;
+           $(libcmt) ;
 
 # External libraries linked with libraries other than the dylan library
 # (via the DylanLibrary function defined below)
 suplibs ?= kernel32.lib dylan-support.lib ;
 
-libcmt	?= libcmt.lib ;
-
 # Linker flags and libraries for GUI applications
 # Used in the Linker-Options: LID keyword of DUIM applications.
 guilflags ?= /RELEASE /subsystem:windows,4.0 ;

sources/jamfiles/x86-win32-vc8-build.jam

@@ -47,17 +47,17 @@ LINKFLAGS ?= /NODEFAULTLIB /INCREMENTAL:NO /DEBUG /MANIFEST ;
 # Runtime
 #
 
+libcmt	?= libcmt.lib ;
+
 # External libraries linked with the dylan library
 # (via the Linker-Options: keyword in Sources/dylan/dylan.lid)
 rtlibs  ?= kernel32.lib pentium-run-time.lib mmdw.lib mpsplinth.lib 
-           minvcrt.lib ;
+           $(libcmt) ;
 
 # External libraries linked with libraries other than the dylan library
 # (via the DylanLibrary function defined below)
 suplibs ?= kernel32.lib dylan-support.lib ;
 
-libcmt	?= libcmt.lib ;
-
 # Linker flags and libraries for GUI applications
 # Used in the Linker-Options: LID keyword of DUIM applications.
 guilflags ?= /RELEASE /subsystem:windows,4.0 ;

sources/lib/c-ffi/test/c-ffi-test.lid

@@ -4,7 +4,6 @@ Files:     c-ffi-test-library
            tests
 C-Source-Files: main.c
 C-Header-Files: main.h
-C-Libraries:    $(libcmt)
 Copyright:    Original Code is Copyright (c) 1995-2004 Functional Objects, Inc.
               All rights reserved.
 License:      See License.txt in this distribution for details.

sources/lib/run-time/Makefile.win32

@@ -40,12 +40,10 @@ OBJS	 = collector.obj break.obj $(HEAPOBJS) harp-support\x86-windows\runtime.obj
 LIBFILE	 = pentium-run-time.lib
 USEROBJ	 = harp-support\x86-windows\dylan-support.obj
 USERLIB	 = dylan-support.lib
-MINCRT   = minvcrt.lib
 
 RUNTIMELIBDEST	 = $(LIBDEST)\pentium-run-time.lib
 MMDWDEST	 = $(LIBDEST)\mmdw.lib
 PLINTHDEST	 = $(LIBDEST)\mpsplinth.lib
-MINCRTDEST	 = $(LIBDEST)\minvcrt.lib
 
 RELEASEMMDW     = $(SDK4MEMORY_POOL_SYSTEM)\code\w3i3mv\hi\mmdw.lib
 RELEASEPLINTH	  = $(SDK4MEMORY_POOL_SYSTEM)\code\w3i3mv\hi\mpsplan.lib
@@ -59,17 +57,6 @@ SYMBOLICPLINTH	 = mpsplan.lib
 PLINTHOBJS       = plinth.obj mpsiowin32.obj
 DYLANPLINTH      = dylan-plinth.lib
 
-!if defined(fullcrt)
-$(MINCRT):
-!else
-$(MINCRT): minvcrt.def rtsyms.obj
-	$(LINKLIB)$(MINCRT) /def:minvcrt.def /machine:ix86
-	$(LINKLIB)$(MINCRT) $(MINCRT) rtsyms.obj
-
-rtsyms.obj: rtsyms.s
-	as -n -o rtsyms.obj rtsyms.s
-!endif
-
 $(DYLANPLINTH): $(PLINTHOBJS)
 	$(LINKLIB)$(DYLANPLINTH) $(PLINTHOBJS)
 
@@ -119,23 +106,13 @@ install-plinth: install-dylan-plinth
   echo Building pentium run time: install-plinth
 
 
-!if defined(fullcrt)
-install-mincrt:
-   echo Building pentium run time: install-mincrt (fullcrt)
-!else
-install-mincrt: $(MINCRT)
-  echo Building pentium run time: install-mincrt
-	if exist $(MINCRTDEST) del /q /f $(MINCRTDEST)
-	copy $(MINCRT) $(MINCRTDEST)
-!endif
-
 install-mmdw:
-  echo Building pentium run time: install-mmdw
+	echo Building pentium run time: install-mmdw
 	if exist $(MMDWDEST) del /q /f $(MMDWDEST)
 	if not exist $(RELEASEMMDW) pushd $(SDK4MEMORY_POOL_SYSTEM)\code \
 	& $(MAKE) /k /f w3i3mv.nmk mmdw.lib > $(BUILD_LOGS)\make-mmdw.log \
 	& popd
-  copy $(RELEASEMMDW) $(MMDWDEST)
+	copy $(RELEASEMMDW) $(MMDWDEST)
 
 install-symbolic-mmdw: $(SYMBOLICMMDW)
   echo Building pentium run time: install-symbolic-mmdw
@@ -148,7 +125,7 @@ install-debug-mmdw: $(DEBUGMMDW)
 	copy $(DEBUGMMDW) $(MMDWDEST)
 
 
-install-common-libs: ensure-dirs install-plinth install-userlib install-mincrt
+install-common-libs: ensure-dirs install-plinth install-userlib
 
 
 install-stripped: ensure-dirs install-mmdw install-runtime install-common-libs
@@ -164,7 +141,6 @@ install: ensure-dirs install-stripped install-build
 # (The files runtime.obj & dylan-support.obj are checked out from HOPE)
 clean:
 	pushd . & (del /f /q *collector.obj break.obj $(HEAPOBJS) windows-threads-primitives.obj windows-spy-interfaces.obj) & popd
-        pushd . & (del /f /q *pentium-run-time.lib $(USERLIB)) & popd
-        pushd . & (del /f /q $(MINCRT) mincrt.def) & popd
-        pushd . & (del /f /q $(DYLANPLINTH) $(PLINTHOBJS)) & popd
+	pushd . & (del /f /q *pentium-run-time.lib $(USERLIB)) & popd
+	pushd . & (del /f /q $(DYLANPLINTH) $(PLINTHOBJS)) & popd
 

sources/runtime-manager/access-path/win32-access-path.lid

@@ -1,7 +1,6 @@
 library:     access-path
 LID:         access-path.lid
 C-libraries: devnub.lib
-             minvcrt.lib
              dbghelp.LIB
 Copyright:    Original Code is Copyright (c) 1995-2004 Functional Objects, Inc.
               All rights reserved.

sources/runtime-manager/debugger-nub/server/remote-nub.hdp

@@ -15,6 +15,5 @@ other-files:	remote-nub.spec
 RC-Files:	..\debugger-server.rc
 C-Header-Files: ..\debugger-server.ico
 C-libraries: devnub.lib
-             minvcrt.lib
              dbghelp.lib
 comment:	additional keywords