Update to VC++ build files

8 files changed, 47 insertions, 56 deletions

diff --git a/VC++Files/strings/MASM6x/strings.dsp b/VC++Files/strings/MASM6x/strings.dsp
index 0c1a3bdc0c2..1f54910bf58 100644
--- a/VC++Files/strings/MASM6x/strings.dsp
+++ b/VC++Files/strings/MASM6x/strings.dsp
@@ -7,19 +7,19 @@
 CFG=strings - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "strings.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "strings.mak" CFG="strings - Win32 Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "strings - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "strings - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
+!MESSAGE
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -76,7 +76,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib_debug\strings.lib"
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
@@ -186,7 +186,7 @@ InputName=Strings
 
 # End Custom Build
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -233,7 +233,7 @@ InputName=Strxmov
 
 # End Custom Build
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
diff --git a/VC++Files/strings/MASM6x/strings.dsw b/VC++Files/strings/MASM6x/strings.dsw
index e3777b8e7d5..63fc3706c19 100644
--- a/VC++Files/strings/MASM6x/strings.dsw
+++ b/VC++Files/strings/MASM6x/strings.dsw
@@ -26,4 +26,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-
diff --git a/VC++Files/strings/backup/strings.dsp b/VC++Files/strings/backup/strings.dsp
index 45b22c52e21..a6be39b40ab 100644
--- a/VC++Files/strings/backup/strings.dsp
+++ b/VC++Files/strings/backup/strings.dsp
@@ -7,19 +7,19 @@
 CFG=strings - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "strings.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "strings.mak" CFG="strings - Win32 Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "strings - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "strings - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
+!MESSAGE
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -76,7 +76,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib_debug\strings.lib"
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
@@ -186,7 +186,7 @@ InputName=Strings
 
 # End Custom Build
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -233,7 +233,7 @@ InputName=Strxmov
 
 # End Custom Build
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
diff --git a/VC++Files/strings/backup/strings.dsw b/VC++Files/strings/backup/strings.dsw
index e3777b8e7d5..63fc3706c19 100644
--- a/VC++Files/strings/backup/strings.dsw
+++ b/VC++Files/strings/backup/strings.dsw
@@ -26,4 +26,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-
diff --git a/VC++Files/strings/noMASM/strings.dsp b/VC++Files/strings/noMASM/strings.dsp
index a84fb1b7835..6e2dbb3c013 100644
--- a/VC++Files/strings/noMASM/strings.dsp
+++ b/VC++Files/strings/noMASM/strings.dsp
@@ -7,19 +7,19 @@
 CFG=strings - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "strings.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "strings.mak" CFG="strings - Win32 Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "strings - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "strings - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
+!MESSAGE
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -76,7 +76,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib_debug\strings.lib"
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
diff --git a/VC++Files/strings/noMASM/strings.dsw b/VC++Files/strings/noMASM/strings.dsw
index e3777b8e7d5..63fc3706c19 100644
--- a/VC++Files/strings/noMASM/strings.dsw
+++ b/VC++Files/strings/noMASM/strings.dsw
@@ -26,4 +26,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-
diff --git a/VC++Files/strings/strings.dsp b/VC++Files/strings/strings.dsp
index bf3ac1831e8..2f206b30ba6 100644
--- a/VC++Files/strings/strings.dsp
+++ b/VC++Files/strings/strings.dsp
@@ -25,7 +25,7 @@ CFG=strings - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "strings - Win32 Release"
@@ -48,7 +48,7 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=link.exe -lib
+LIB32=xilink6.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib_release\strings.lib"
 
@@ -72,7 +72,7 @@ LIB32=link.exe -lib
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=link.exe -lib
+LIB32=xilink6.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib_debug\strings.lib"
 
@@ -104,11 +104,11 @@ SOURCE=.\bmove512.c
 # End Source File
 # Begin Source File
 
-SOURCE=".\ctype-bin.c"
+SOURCE=".\ctype-big5.c"
 # End Source File
 # Begin Source File
 
-SOURCE=".\ctype-big5.c"
+SOURCE=".\ctype-bin.c"
 # End Source File
 # Begin Source File
 
@@ -132,6 +132,10 @@ SOURCE=".\ctype-latin1_de.c"
 # End Source File
 # Begin Source File
 
+SOURCE=".\ctype-mb.c"
+# End Source File
+# Begin Source File
+
 SOURCE=".\ctype-simple.c"
 # End Source File
 # Begin Source File
@@ -148,39 +152,39 @@ SOURCE=".\ctype-ujis.c"
 # End Source File
 # Begin Source File
 
-SOURCE=.\ctype.c
+SOURCE=".\ctype-utf8.c"
 # End Source File
 # Begin Source File
 
-SOURCE=.\int2str.c
+SOURCE=".\ctype-win1250ch.c"
 # End Source File
 # Begin Source File
 
-SOURCE=.\llstr.c
+SOURCE=.\ctype.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\longlong2str.c
+SOURCE=.\int2str.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\r_strinstr.c
+SOURCE=.\llstr.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\str2int.c
+SOURCE=.\longlong2str.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strcend.c
+SOURCE=.\my_vsnprintf.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strend.c
+SOURCE=.\r_strinstr.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strfill.c
+SOURCE=.\str2int.c
 # End Source File
 # Begin Source File
 
@@ -215,19 +219,6 @@ InputName=Strings
 # End Source File
 # Begin Source File
 
-SOURCE=.\strmake.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\strmov.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\strnmov.c
-# End Source File
-# Begin Source File
-
-
 SOURCE=.\strtol.c
 # End Source File
 # Begin Source File
@@ -277,5 +268,9 @@ InputName=Strxmov
 
 SOURCE=.\strxnmov.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\xml.c
+# End Source File
 # End Target
 # End Project
diff --git a/VC++Files/strings/strings.dsw b/VC++Files/strings/strings.dsw
index e3777b8e7d5..63fc3706c19 100644
--- a/VC++Files/strings/strings.dsw
+++ b/VC++Files/strings/strings.dsw
@@ -26,4 +26,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-