Update the MSVC project. I don't understand all the

changes, but it seems to work.

diff --git a/expat/lib/expat.dsp b/expat/lib/expat.dsp
index 56934364e4ae03bcff7bd109725ee3c58114e96e..95f48a1aef54a14968db48e8cbc990013d8e1e2f 100644 (file)
--- a/expat/lib/expat.dsp
+++ b/expat/lib/expat.dsp
@@ -42,7 +42,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /D "COMPILED_FROM_DSP" /Yu"stdafx.h" /FD /c\r
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /D "COMPILED_FROM_DSP" /FD /c\r
+# SUBTRACT CPP /YX /Yc /Yu\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
@@ -68,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "_DEBUG" /D "COMPILED_FROM_DSP" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /FD /GZ /c\r
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "_DEBUG" /D "COMPILED_FROM_DSP" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /FR /FD /GZ /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
@@ -95,11 +96,11 @@ SOURCE=.\xmlparse.c
 \r
 !IF  "$(CFG)" == "expat - Win32 Release"\r
 \r
-# ADD CPP /D VERSION=\"expat_1.95.1\"\r
+# ADD CPP /D VERSION=\"expat_1.95.2\"\r
 \r
 !ELSEIF  "$(CFG)" == "expat - Win32 Debug"\r
 \r
-# ADD CPP /GX- /Od /D VERSION=\"expat_1.95.1\"\r
+# ADD CPP /GX- /Od /D VERSION=\"expat_1.95.2\"\r
 \r
 !ENDIF \r
 \r
@@ -107,64 +108,12 @@ SOURCE=.\xmlparse.c
 # Begin Source File\r
 \r
 SOURCE=.\xmlrole.c\r
-\r
-!IF  "$(CFG)" == "expat - Win32 Release"\r
-\r
-# ADD CPP /D VERSION=\"expat_1.95.1\"\r
-\r
-!ELSEIF  "$(CFG)" == "expat - Win32 Debug"\r
-\r
-# ADD CPP /D VERSION=\"expat_1.95.1\"\r
-\r
-!ENDIF \r
-\r
+# ADD CPP /D VERSION=\"expat_1.95.2\"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\xmltok.c\r
-\r
-!IF  "$(CFG)" == "expat - Win32 Release"\r
-\r
-# ADD CPP /D VERSION=\"expat_1.95.1\"\r
-\r
-!ELSEIF  "$(CFG)" == "expat - Win32 Debug"\r
-\r
-# ADD CPP /D VERSION=\"expat_1.95.1\"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=xmltok_impl.c\r
-\r
-!IF  "$(CFG)" == "expat - Win32 Release"\r
-\r
-# ADD CPP /D VERSION=\"expat_1.95.1\"\r
-\r
-!ELSEIF  "$(CFG)" == "expat - Win32 Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-# ADD CPP /D VERSION=\"expat_1.95.1\"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=xmltok_ns.c\r
-\r
-!IF  "$(CFG)" == "expat - Win32 Release"\r
-\r
-# ADD CPP /D VERSION=\"expat_1.95.1\"\r
-\r
-!ELSEIF  "$(CFG)" == "expat - Win32 Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-# ADD CPP /D VERSION=\"expat_1.95.1\"\r
-\r
-!ENDIF \r
-\r
+# ADD CPP /D VERSION=\"expat_1.95.2\"\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
@@ -219,9 +168,5 @@ SOURCE=.\xmltok_impl.h
 \r
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
 # End Group\r
-# Begin Source File\r
-\r
-SOURCE=.\ReadMe.txt\r
-# End Source File\r
 # End Target\r
 # End Project\r