dmitryh 2004/08/13 10:25:20
Modified: c/Projects/Win32/VC6/AllInOne AllInOne.dsp
AllInOneWithICU.dsp
Log:
Fix for the Win64 build : don't link with the Intel's default libmmd.lib
libarary
Revision Changes Path
1.58 +2 -2 xml-xalan/c/Projects/Win32/VC6/AllInOne/AllInOne.dsp
Index: AllInOne.dsp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC6/AllInOne/AllInOne.dsp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- AllInOne.dsp 13 Aug 2004 06:03:37 -0000 1.57
+++ AllInOne.dsp 13 Aug 2004 17:25:20 -0000 1.58
@@ -140,7 +140,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 xerces-c_2.lib XalanMessages_1_8.lib /nologo /dll /pdb:none
/machine:IX86 /out:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1_8.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release"
/libpath:"..\..\..\..\Build\Win64\VC6\Release"
/libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
/machine:IA64
+# ADD LINK32 xerces-c_2.lib XalanMessages_1_8.lib /nologo /dll /pdb:none
/machine:IX86 /nodefaultlib:"libmmd.lib"
/out:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1_8.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release"
/libpath:"..\..\..\..\Build\Win64\VC6\Release"
/libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
/machine:IA64
!ELSEIF "$(CFG)" == "AllInOne - Win64 Debug"
@@ -166,7 +166,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib XalanMessages_1_8D.lib /nologo /dll /debug
/machine:IX86 /out:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1_8D.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1D.lib" /pdbtype:sept
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug"
/libpath:"..\..\..\..\Build\Win64\VC6\Debug"
/libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
/machine:IA64
+# ADD LINK32 xerces-c_2D.lib XalanMessages_1_8D.lib /nologo /dll /debug
/machine:IX86 /nodefaultlib:"libmmdd.lib"
/out:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1_8D.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1D.lib" /pdbtype:sept
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug"
/libpath:"..\..\..\..\Build\Win64\VC6\Debug"
/libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
/machine:IA64
# SUBTRACT LINK32 /pdb:none
!ENDIF
1.55 +2 -2
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.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- AllInOneWithICU.dsp 13 Aug 2004 06:03:37 -0000 1.54
+++ AllInOneWithICU.dsp 13 Aug 2004 17:25:20 -0000 1.55
@@ -140,7 +140,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 xerces-c_2.lib XalanMessages_1_8.lib icuuc.lib icuin.lib
/nologo /dll /pdb:none /machine:IX86
/out:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1_8.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release"
/libpath:"..\..\..\..\..\..\icu\lib"
/libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
/libpath:"$(ICUROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_2.lib XalanMessages_1_8.lib icuuc.lib icuin.lib
/nologo /dll /pdb:none /machine:IX86 /nodefaultlib:"libmmd.lib"
/out:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1_8.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release"
/libpath:"..\..\..\..\..\..\icu\lib"
/libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
/libpath:"$(ICUROOT)\lib" /machine:IA64
!ELSEIF "$(CFG)" == "AllInOneWithICU - Win64 Debug"
@@ -166,7 +166,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib XalanMessages_1_8D.lib icuucd.lib icuind.lib
/nologo /dll /debug /machine:IX86
/out:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1_8D.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1D.lib" /pdbtype:sept
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug"
/libpath:"..\..\..\..\..\..\icu\lib"
/libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
/libpath:"$(ICUROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_2D.lib XalanMessages_1_8D.lib icuucd.lib icuind.lib
/nologo /dll /debug /machine:IX86 /nodefaultlib:"libmmdd.lib"
/out:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1_8D.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1D.lib" /pdbtype:sept
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug"
/libpath:"..\..\..\..\..\..\icu\lib"
/libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
/libpath:"$(ICUROOT)\lib" /machine:IA64
# SUBTRACT LINK32 /pdb:none
!ENDIF
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
