mhoyt 2004/10/06 15:47:58
Modified: c/Projects/Win32/VC6/AllInOne AllInOneWithICU.dsp
c/Projects/Win32/VC6/TestXSLT TestXSLT.dsp
c/Tests/InputSource inputsource.dsp
c/Tests/Performance perf.dsp
Log:
Fix VC6 projects for ICU-enabled Xalan
Revision Changes Path
1.57 +3 -3
xml-xalan/c/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp
Index: AllInOneWithICU.dsp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- AllInOneWithICU.dsp 30 Sep 2004 22:28:10 -0000 1.56
+++ AllInOneWithICU.dsp 6 Oct 2004 22:47:58 -0000 1.57
@@ -46,7 +46,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /D "XSLT_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I
"..\..\..\..\Build\Win32\VC6\Release\Nls\Include" /I
"..\..\..\..\..\..\xml-xerces\c\src" /I "..\..\..\..\src\\" /I
"..\..\..\..\..\..\icu\include" /I "$(XERCESCROOT)\src" /I
"$(XERCESCROOT)\include" /I "$(ICUROOT)\include" /D "NDEBUG" /D
"XALAN_DOMSUPPORT_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
/D "XALAN_XSLT_BUILD_DLL" /D "XALAN_PLATFORMSUPPORT_BUILD_DLL" /D
"XALAN_DOM_BUILD_DLL" /D "XALAN_XALANEXTENSIONS_BUILD_DLL" /D
"XALAN_XALANSOURCETREE_BUILD_DLL" /D "XALAN_TRANSFORMER_BUILD_DLL" /D
"XALAN_XERCESPARSERLIAISON_BUILD_DLL" /D "XALAN_XMLSUPPORT_BUILD_DLL" /D
"XALAN_XPATH_BUILD_DLL" /D "XALAN_XPATHCAPI_BUILD_DLL" /D
"XALAN_ALLINONE_BUILD_DLL" /D "XALAN_EXSLT_BUILD_DLL" /D
"XALAN_ICUBRIDGE_BUILD_DLL" /D "XALAN_HARNESS_BUILD_DLL" /D "XALAN_USE_ICU" /D
"XALAN_ICU_MSG_LOADER" /FD /Zm125 /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I
"..\..\..\..\Build\Win32\VC6\Release\Nls\Include" /I
"..\..\..\..\..\..\xml-xerces\c\src" /I "..\..\..\..\src\\" /I
"..\..\..\..\..\..\icu\include" /I "$(XERCESCROOT)\src" /I
"$(XERCESCROOT)\include" /I "$(ICUROOT)\include" /D "NDEBUG" /D
"XALAN_DOMSUPPORT_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
/D "XALAN_XSLT_BUILD_DLL" /D "XALAN_PLATFORMSUPPORT_BUILD_DLL" /D
"XALAN_DOM_BUILD_DLL" /D "XALAN_XALANEXTENSIONS_BUILD_DLL" /D
"XALAN_XALANSOURCETREE_BUILD_DLL" /D "XALAN_TRANSFORMER_BUILD_DLL" /D
"XALAN_XERCESPARSERLIAISON_BUILD_DLL" /D "XALAN_XMLSUPPORT_BUILD_DLL" /D
"XALAN_XPATH_BUILD_DLL" /D "XALAN_XPATHCAPI_BUILD_DLL" /D
"XALAN_ALLINONE_BUILD_DLL" /D "XALAN_EXSLT_BUILD_DLL" /D
"XALAN_ICUBRIDGE_BUILD_DLL" /D "XALAN_HARNESS_BUILD_DLL" /D "XALAN_USE_ICU" /D
"XALAN_ICU_MSG_LOADER" /FD /Zm250 /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -72,7 +72,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XSLT_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I
"..\..\..\..\Build\Win32\VC6\Debug\Nls\Include" /I
"..\..\..\..\..\..\xml-xerces\c\src" /I "..\..\..\..\src\\" /I
"..\..\..\..\..\..\icu\include" /I "$(XERCESCROOT)\src" /I
"$(XERCESCROOT)\include" /I "$(ICUROOT)\include" /D "_DEBUG" /D
"XALAN_DOMSUPPORT_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
/D "XALAN_XSLT_BUILD_DLL" /D "XALAN_PLATFORMSUPPORT_BUILD_DLL" /D
"XALAN_DOM_BUILD_DLL" /D "XALAN_XALANEXTENSIONS_BUILD_DLL" /D
"XALAN_XALANSOURCETREE_BUILD_DLL" /D "XALAN_TRANSFORMER_BUILD_DLL" /D
"XALAN_XERCESPARSERLIAISON_BUILD_DLL" /D "XALAN_XMLSUPPORT_BUILD_DLL" /D
"XALAN_XPATH_BUILD_DLL" /D "XALAN_XPATHCAPI_BUILD_DLL" /D
"XALAN_ALLINONE_BUILD_DLL" /D "XALAN_EXSLT_BUILD_DLL" /D
"XALAN_ICUBRIDGE_BUILD_DLL" /D "XALAN_HARNESS_BUILD_DLL" /D "XALAN_USE_ICU" /D
"XALAN_ICU_MSG_LOADER" /YX /FD /GZ /Zm125 /c
+# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I
"..\..\..\..\Build\Win32\VC6\Debug\Nls\Include" /I
"..\..\..\..\..\..\xml-xerces\c\src" /I "..\..\..\..\src\\" /I
"..\..\..\..\..\..\icu\include" /I "$(XERCESCROOT)\src" /I
"$(XERCESCROOT)\include" /I "$(ICUROOT)\include" /D "_DEBUG" /D
"XALAN_DOMSUPPORT_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
/D "XALAN_XSLT_BUILD_DLL" /D "XALAN_PLATFORMSUPPORT_BUILD_DLL" /D
"XALAN_DOM_BUILD_DLL" /D "XALAN_XALANEXTENSIONS_BUILD_DLL" /D
"XALAN_XALANSOURCETREE_BUILD_DLL" /D "XALAN_TRANSFORMER_BUILD_DLL" /D
"XALAN_XERCESPARSERLIAISON_BUILD_DLL" /D "XALAN_XMLSUPPORT_BUILD_DLL" /D
"XALAN_XPATH_BUILD_DLL" /D "XALAN_XPATHCAPI_BUILD_DLL" /D
"XALAN_ALLINONE_BUILD_DLL" /D "XALAN_EXSLT_BUILD_DLL" /D
"XALAN_ICUBRIDGE_BUILD_DLL" /D "XALAN_HARNESS_BUILD_DLL" /D "XALAN_USE_ICU" /D
"XALAN_ICU_MSG_LOADER" /YX /FD /GZ /Zm250 /c
# SUBTRACT CPP /Fr
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -102,7 +102,7 @@
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W4 /GR /GX /O2 /I
"..\..\..\..\..\..\xml-xerces\c\src" /I "..\..\..\..\src\\" /D "WIN32" /D
"NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XALAN_XSLT_BUILD_DLL" /D
"XALAN_XERCES" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I
"..\..\..\..\Build\Win32\VC6\Release.symbols\Nls\Include" /I
"..\..\..\..\..\..\xml-xerces\c\src" /I "..\..\..\..\src\\" /I
"..\..\..\..\..\..\icu\include" /I "$(XERCESCROOT)\src" /I
"$(XERCESCROOT)\include" /I "$(ICUROOT)\include" /D "NDEBUG" /D
"NDEBUG_SYMBOLS" /D "XALAN_DOMSUPPORT_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "XALAN_XSLT_BUILD_DLL" /D
"XALAN_PLATFORMSUPPORT_BUILD_DLL" /D "XALAN_DOM_BUILD_DLL" /D
"XALAN_XALANEXTENSIONS_BUILD_DLL" /D "XALAN_XALANSOURCETREE_BUILD_DLL" /D
"XALAN_TRANSFORMER_BUILD_DLL" /D "XALAN_XERCESPARSERLIAISON_BUILD_DLL" /D
"XALAN_XMLSUPPORT_BUILD_DLL" /D "XALAN_XPATH_BUILD_DLL" /D
"XALAN_XPATHCAPI_BUILD_DLL" /D "XALAN_ALLINONE_BUILD_DLL" /D
"XALAN_EXSLT_BUILD_DLL" /D "XALAN_ICUBRIDGE_BUILD_DLL" /D
"XALAN_HARNESS_BUILD_DLL" /D "XALAN_USE_ICU" /D "XALAN_ICU_MSG_LOADER" /FD
/Zm125 /c
+# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I
"..\..\..\..\Build\Win32\VC6\Release.symbols\Nls\Include" /I
"..\..\..\..\..\..\xml-xerces\c\src" /I "..\..\..\..\src\\" /I
"..\..\..\..\..\..\icu\include" /I "$(XERCESCROOT)\src" /I
"$(XERCESCROOT)\include" /I "$(ICUROOT)\include" /D "NDEBUG" /D
"NDEBUG_SYMBOLS" /D "XALAN_DOMSUPPORT_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "XALAN_XSLT_BUILD_DLL" /D
"XALAN_PLATFORMSUPPORT_BUILD_DLL" /D "XALAN_DOM_BUILD_DLL" /D
"XALAN_XALANEXTENSIONS_BUILD_DLL" /D "XALAN_XALANSOURCETREE_BUILD_DLL" /D
"XALAN_TRANSFORMER_BUILD_DLL" /D "XALAN_XERCESPARSERLIAISON_BUILD_DLL" /D
"XALAN_XMLSUPPORT_BUILD_DLL" /D "XALAN_XPATH_BUILD_DLL" /D
"XALAN_XPATHCAPI_BUILD_DLL" /D "XALAN_ALLINONE_BUILD_DLL" /D
"XALAN_EXSLT_BUILD_DLL" /D "XALAN_ICUBRIDGE_BUILD_DLL" /D
"XALAN_HARNESS_BUILD_DLL" /D "XALAN_USE_ICU" /D "XALAN_ICU_MSG_LOADER" /FD
/Zm250 /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
1.21 +1 -1 xml-xalan/c/Projects/Win32/VC6/TestXSLT/TestXSLT.dsp
Index: TestXSLT.dsp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC6/TestXSLT/TestXSLT.dsp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TestXSLT.dsp 5 Aug 2004 23:33:37 -0000 1.20
+++ TestXSLT.dsp 6 Oct 2004 22:47:58 -0000 1.21
@@ -45,7 +45,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I
"..\..\..\..\..\..\xml-xerces\c\src" /I "..\..\..\..\src\\" /I
"$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_USRDLL" /D
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I
"..\..\..\..\..\..\xml-xerces\c\src" /I "..\..\..\..\src\\" /I
"$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_USRDLL" /D
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_CONSOLE" /FD /Zm250 /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
1.8 +3 -5 xml-xalan/c/Tests/InputSource/inputsource.dsp
Index: inputsource.dsp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/InputSource/inputsource.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- inputsource.dsp 21 Apr 2004 19:30:03 -0000 1.7
+++ inputsource.dsp 6 Oct 2004 22:47:58 -0000 1.8
@@ -45,8 +45,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D
"_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src"
/I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D
"WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src"
/I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D
"WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /Zm250 /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -70,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I
"..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D
"_WINDOWS" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I
"..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D
"_WINDOWS" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /Zm250 /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -95,8 +94,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\xml-xerces\c\src" /I
"..\..\src\\" /I "..\harness\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"
/YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I
"..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src"
/I "$(XERCESCROOT)\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD
/c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I
"..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src"
/I "$(XERCESCROOT)\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD
/Zm250 /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
1.17 +3 -6 xml-xalan/c/Tests/Performance/perf.dsp
Index: perf.dsp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Performance/perf.dsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- perf.dsp 5 Aug 2004 23:36:20 -0000 1.16
+++ perf.dsp 6 Oct 2004 22:47:58 -0000 1.17
@@ -45,8 +45,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D
"_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src"
/I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D
"WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src"
/I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D
"WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /Zm250 /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -97,8 +96,7 @@
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I
"..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "..\harness\\" /D "WIN32" /D
"NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I
"..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src"
/I "$(XERCESCROOT)\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD
/c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I
"..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src"
/I "$(XERCESCROOT)\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD
/Zm250 /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -123,8 +121,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D
"_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src"
/I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D
"WIN64" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src"
/I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D
"WIN64" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /Zm250 /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]