You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2007/03/02 10:02:52 UTC
svn commit: r513666 [1/5] - in /xerces/c/trunk:
Projects/Win32/BCB6/Xerces-all/XercesLib/
Projects/Win32/BCC.551/Xerces-all/XercesLib/ Projects/Win32/VC6/xerces-all/
Projects/Win32/VC6/xerces-all/CreateDOMDocument/
Projects/Win32/VC6/xerces-all/DOMCoun...
Author: amassari
Date: Fri Mar 2 01:02:50 2007
New Revision: 513666
URL: http://svn.apache.org/viewvc?view=rev&rev=513666
Log:
Makefile integration for XInclude
Added:
xerces/c/trunk/Projects/Win32/VC6/xerces-all/XInclude/
xerces/c/trunk/Projects/Win32/VC6/xerces-all/XInclude/XInclude.dsp (with props)
xerces/c/trunk/Projects/Win32/VC6/xerces-all/XInclude/XInclude.mak
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XInclude/
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XInclude/XInclude.vcproj
xerces/c/trunk/Projects/Win32/VC8/xerces-all/XInclude/
xerces/c/trunk/Projects/Win32/VC8/xerces-all/XInclude/XInclude.vcproj
Modified:
xerces/c/trunk/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/CreateDOMDocument/CreateDOMDocument.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMCount/DOMCount.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMMemTest/DOMMemTest.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMNormalizerTest/DOMNormalizerTest.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMPrint/DOMPrint.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMTest/DOMTest.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMTraversalTest/DOMTraversalTest.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/EncodingTest/EncodingTest.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/EnumVal/EnumVal.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/InitTermTest/InitTermTest.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/MemHandlerTest/MemHandlerTest.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/MemParse/MemParse.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/PParse/PParse.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/PSVIWriter/PSVIWriter.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/RangeTest/RangeTest.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/Redirect/Redirect.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/SAX2Count/SAX2Count.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/SAX2Print/SAX2Print.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/SAXCount/SAXCount.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/SAXPrint/SAXPrint.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/SCMPrint/SCMPrint.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/SEnumVal/SEnumVal.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/StdInParse/StdInParse.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/ThreadTest/ThreadTest.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/XSValueTest/XSValueTest.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/XSerializerTest/XSerializerTest.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
xerces/c/trunk/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/all/all.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/xerces-all.dsw
xerces/c/trunk/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.mak
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SEnumVal/SEnumVal.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/xerces-all.sln
xerces/c/trunk/Projects/Win32/VC8/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj
xerces/c/trunk/Projects/Win32/VC8/xerces-all/xerces-all.sln
xerces/c/trunk/samples/Makefile.am
xerces/c/trunk/samples/Makefile.in
xerces/c/trunk/src/Makefile.am
xerces/c/trunk/src/Makefile.in
Modified: xerces/c/trunk/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr?view=diff&rev=513666&r1=513665&r2=513666
==============================================================================
--- xerces/c/trunk/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr (original)
+++ xerces/c/trunk/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr Fri Mar 2 01:02:50 2007
@@ -306,7 +306,10 @@
..\..\..\..\..\Build\Win32\BCB6\obj\DOMLSInputImpl.obj
..\..\..\..\..\Build\Win32\BCB6\obj\DOMXPathExpressionImpl.obj
..\..\..\..\..\Build\Win32\BCB6\obj\DOMXPathNSResolverImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOMXPathResultImpl.obj"/>
+ ..\..\..\..\..\Build\Win32\BCB6\obj\DOMXPathResultImpl.obj
+ ..\..\..\..\..\Build\Win32\BCB6\obj\XIncludeDOMDocumentProcessor.obj
+ ..\..\..\..\..\Build\Win32\BCB6\obj\XIncludeLocation.obj
+ ..\..\..\..\..\Build\Win32\BCB6\obj\XIncludeUtils.obj"/>
<RESFILES value=""/>
<IDLFILES value=""/>
<IDLGENFILES value=""/>
@@ -316,7 +319,7 @@
<LIBRARIES value=""/>
<SPARELIBS value="rtl.lib"/>
<PACKAGES value="vcl.bpi rtl.bpi"/>
- <PATHCPP value=".;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework\psvi"/>
+ <PATHCPP value=".;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\xinclude"/
>
<PATHPAS value=".;"/>
<PATHRC value=".;"/>
<PATHASM value=".;"/>
@@ -326,8 +329,8 @@
<USERDEFINES value="_DEBUG;PLATFORM_WIN32;XERCES_BUILDING_LIBRARY;XERCES_PATH_DELIMITER_BACKSLASH=1;XERCES_USE_FILEMGR_WINDOWS=1;XERCES_USE_MUTEXMGR_WINDOWS=1;XERCES_USE_ATOMICOPMGR_WINDOWS=1;XERCES_USE_NETACCESSOR_WINSOCK=1;XERCES_USE_TRANSCODER_WINDOWS=1;XERCES_USE_MSGLOADER_INMEMORY=1;HAVE_LIMITS_H=1;HAVE_FTIME=1;HAVE_SYS_TIMEB_H=1;HAVE_STRICMP=1;HAVE_STRNICMP=1;HAVE_WCSUPR=1;HAVE_WCSLWR=1;HAVE_WCSICMP=1;HAVE_WCSNICMP=1;"/>
<SYSDEFINES value="NO_STRICT;_RTLDLL;USEPACKAGES"/>
<MAINSOURCE value="Xerceslib.cpp"/>
- <INCLUDEPATH value="..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src;$(BCB)\include"/>
- <LIBPATH value="..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <INCLUDEPATH value="..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src;..\..\..\..\..\src\xercesc\xinclude;$(BCB)\include"/>
+ <LIBPATH value="..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src;..\..\..\..\..\src\xercesc\xinclude;$(BCB)\lib\obj;$(BCB)\lib"/>
<WARNINGS value="-w-par -w-8027 -w-8026"/>
<OTHERFILES value=""/>
</MACROS>
@@ -350,6 +353,7 @@
-I..\..\..\..\..\src\xercesc\util\AtomicOpManagers
-I..\..\..\..\..\src\xercesc\util\FileManagers
-I..\..\..\..\..\src\xercesc\util\MutexManagers -I..\..\..\..\..\src
+ -I..\..\..\..\..\src\xercesc\xinclude
-I$(BCB)\include -src_suffix cpp -D_DEBUG -DPLATFORM_WIN32
-DXERCES_BUILDING_LIBRARY -DXERCES_PATH_DELIMITER_BACKSLASH=1
-DXERCES_USE_FILEMGR_WINDOWS=1 -DXERCES_USE_MUTEXMGR_WINDOWS=1
@@ -676,6 +680,9 @@
<FILE FILENAME="..\..\..\..\..\src\xercesc\dom\impl\DOMXPathExpressionImpl.cpp" FORMNAME="" UNITNAME="DOMXPathExpressionImpl.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\dom\impl\DOMXPathNSResolverImpl.cpp" FORMNAME="" UNITNAME="DOMXPathNSResolverImpl.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\dom\impl\DOMXPathResultImpl.cpp" FORMNAME="" UNITNAME="DOMXPathResultImpl.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\..\..\..\src\xercesc\xinclude\XIncludeDOMDocumentProcessor.cpp" FORMNAME="" UNITNAME="XIncludeDOMDocumentProcessor.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\..\..\..\src\xercesc\xinclude\XIncludeLocation.cpp" FORMNAME="" UNITNAME="XIncludeLocation.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\..\..\..\src\xercesc\xinclude\XIncludeUtils.cpp" FORMNAME="" UNITNAME="XIncludeUtils.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
</FILELIST>
<BUILDTOOLS>
</BUILDTOOLS>
Modified: xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak?view=diff&rev=513666&r1=513665&r2=513666
==============================================================================
--- xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak (original)
+++ xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak Fri Mar 2 01:02:50 2007
@@ -308,7 +308,10 @@
$(TARGETPATH)\obj\WindowsMutexMgr.obj \
$(TARGETPATH)\obj\DOMXPathExpressionImpl.obj \
$(TARGETPATH)\obj\DOMXPathNSResolverImpl.obj \
- $(TARGETPATH)\obj\DOMXPathResultImpl.obj
+ $(TARGETPATH)\obj\DOMXPathResultImpl.obj \
+ $(TARGETPATH)\obj\XIncludeDOMDocumentProcessor.obj \
+ $(TARGETPATH)\obj\XIncludeLocation.obj \
+ $(TARGETPATH)\obj\XIncludeUtils.obj
RESFILES =
MAINSOURCE = XercesLib.cpp
RESDEPEN = $(RESFILES)
@@ -319,7 +322,7 @@
SPARELIBS =
DEFFILE =
# ---------------------------------------------------------------------------
-PATHCPP = .;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;
+PATHCPP = .;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\xinclude;
PATHASM = .;
PATHPAS = .;
PATHRC = .;..\..\..\..\..\src\xercesc\util\Platforms\Win32
@@ -328,8 +331,8 @@
!endif
USERDEFINES = _DEBUG;XERCES_BUILDING_LIBRARY;XERCES_USE_FILEMGR_WINDOWS=1;XERCES_USE_MUTEXMGR_WINDOWS=1;XERCES_USE_ATOMICOPMGR_WINDOWS=1;XERCES_USE_NETACCESSOR_WINSOCK=1;XERCES_USE_MSGLOADER_INMEMORY=1;XERCES_USE_TRANSCODER_WINDOWS=1;XERCES_PATH_DELIMITER_BACKSLASH=1;HAVE_LIMITS_H=1;HAVE_SYS_TIMEB_H=1;HAVE_FTIME=1;HAVE_STRICMP=1;HAVE_STRNICMP=1;HAVE_WCSUPR=1;HAVE_WCSLWR=1;HAVE_WCSICMP=1;HAVE_WCSNICMP=1;$(XERCES_NO_ASM)
SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
-INCLUDEPATH = ..\..\..\..\..\src;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;
-LIBPATH = ..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;
+INCLUDEPATH = ..\..\..\..\..\src;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\xinclude;
+LIBPATH = ..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\xinclude;
WARNINGS= -w-par
# ---------------------------------------------------------------------------
CFLAG1 = -tWD -Od -Vx -Ve -X- -r- -a8 -4 -b -k -y -v -vi- -c -tWM
Modified: xerces/c/trunk/Projects/Win32/VC6/xerces-all/CreateDOMDocument/CreateDOMDocument.mak
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC6/xerces-all/CreateDOMDocument/CreateDOMDocument.mak?view=diff&rev=513666&r1=513665&r2=513666
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/CreateDOMDocument/CreateDOMDocument.mak (original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/CreateDOMDocument/CreateDOMDocument.mak Fri Mar 2 01:02:50 2007
@@ -27,6 +27,9 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "CreateDOMDocument - Win32 Release"
OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -61,49 +64,16 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "_CONSOLE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "_CONSOLE" /D "NDEBUG" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
BSC32=bscmake.exe
BSC32_FLAGS=/o"$(OUTDIR)\CreateDOMDocument.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\CreateDOMDocument.pdb" /machine:I386 /out:"$(OUTDIR)\CreateDOMDocument.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\CreateDOMDocument.pdb" /machine:I386 /out:"$(OUTDIR)\CreateDOMDocument.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
LINK32_OBJS= \
"$(INTDIR)\CreateDOMDocument.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
+ "$(OUTDIR)\xerces-c_3.lib"
"$(OUTDIR)\CreateDOMDocument.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -146,49 +116,16 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_CONSOLE" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
BSC32=bscmake.exe
BSC32_FLAGS=/o"$(OUTDIR)\CreateDOMDocument.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\CreateDOMDocument.pdb" /debug /machine:I386 /out:"$(OUTDIR)\CreateDOMDocument.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\CreateDOMDocument.pdb" /debug /machine:I386 /out:"$(OUTDIR)\CreateDOMDocument.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
LINK32_OBJS= \
"$(INTDIR)\CreateDOMDocument.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\CreateDOMDocument.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -231,49 +168,16 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CONSOLE" /D "_DEBUG" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
BSC32=bscmake.exe
BSC32_FLAGS=/o"$(OUTDIR)\CreateDOMDocument.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\CreateDOMDocument.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\CreateDOMDocument.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\CreateDOMDocument.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\CreateDOMDocument.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
LINK32_OBJS= \
"$(INTDIR)\CreateDOMDocument.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\CreateDOMDocument.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -314,8 +218,23 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "_CONSOLE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "_CONSOLE" /D "NDEBUG" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\CreateDOMDocument.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\CreateDOMDocument.pdb" /machine:IX86 /out:"$(OUTDIR)\CreateDOMDocument.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+LINK32_OBJS= \
+ "$(INTDIR)\CreateDOMDocument.obj" \
+ "$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\CreateDOMDocument.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -347,24 +266,6 @@
$(CPP_PROJ) $<
<<
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\CreateDOMDocument.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\CreateDOMDocument.pdb" /machine:IX86 /out:"$(OUTDIR)\CreateDOMDocument.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
-LINK32_OBJS= \
- "$(INTDIR)\CreateDOMDocument.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\CreateDOMDocument.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("CreateDOMDocument.dep")
@@ -427,7 +328,7 @@
!ENDIF
-SOURCE=..\..\..\..\..\samples\CreateDOMDocument\CreateDOMDocument.cpp
+SOURCE=..\..\..\..\..\samples\src\CreateDOMDocument\CreateDOMDocument.cpp
"$(INTDIR)\CreateDOMDocument.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
Modified: xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMCount/DOMCount.mak
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMCount/DOMCount.mak?view=diff&rev=513666&r1=513665&r2=513666
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMCount/DOMCount.mak (original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMCount/DOMCount.mak Fri Mar 2 01:02:50 2007
@@ -27,6 +27,9 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "DOMCount - Win32 Release"
OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -61,49 +64,16 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "_CONSOLE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
BSC32=bscmake.exe
BSC32_FLAGS=/o"$(OUTDIR)\DOMCount.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMCount.pdb" /machine:I386 /out:"$(OUTDIR)\DOMCount.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMCount.pdb" /machine:I386 /out:"$(OUTDIR)\DOMCount.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
LINK32_OBJS= \
"$(INTDIR)\DOMCount.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
+ "$(OUTDIR)\xerces-c_3.lib"
"$(OUTDIR)\DOMCount.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -146,49 +116,16 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
BSC32=bscmake.exe
BSC32_FLAGS=/o"$(OUTDIR)\DOMCount.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMCount.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMCount.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMCount.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMCount.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
LINK32_OBJS= \
"$(INTDIR)\DOMCount.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\DOMCount.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -231,49 +168,16 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
BSC32=bscmake.exe
BSC32_FLAGS=/o"$(OUTDIR)\DOMCount.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMCount.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMCount.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMCount.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMCount.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
LINK32_OBJS= \
"$(INTDIR)\DOMCount.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\DOMCount.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -314,8 +218,23 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "_CONSOLE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\DOMCount.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMCount.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMCount.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+LINK32_OBJS= \
+ "$(INTDIR)\DOMCount.obj" \
+ "$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\DOMCount.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -347,24 +266,6 @@
$(CPP_PROJ) $<
<<
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMCount.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMCount.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMCount.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
-LINK32_OBJS= \
- "$(INTDIR)\DOMCount.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\DOMCount.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("DOMCount.dep")
@@ -427,7 +328,7 @@
!ENDIF
-SOURCE=..\..\..\..\..\samples\DOMCount\DOMCount.cpp
+SOURCE=..\..\..\..\..\samples\src\DOMCount\DOMCount.cpp
"$(INTDIR)\DOMCount.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
Modified: xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMMemTest/DOMMemTest.mak
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMMemTest/DOMMemTest.mak?view=diff&rev=513666&r1=513665&r2=513666
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMMemTest/DOMMemTest.mak (original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMMemTest/DOMMemTest.mak Fri Mar 2 01:02:50 2007
@@ -27,6 +27,9 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "DOMMemTest - Win32 Release"
OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -60,49 +63,16 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
BSC32=bscmake.exe
BSC32_FLAGS=/o"$(OUTDIR)\DOMMemTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\DOMMemTest.pdb" /machine:I386 /out:"$(OUTDIR)\DOMMemTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\DOMMemTest.pdb" /machine:I386 /out:"$(OUTDIR)\DOMMemTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
LINK32_OBJS= \
"$(INTDIR)\DOMMemTest.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
+ "$(OUTDIR)\xerces-c_3.lib"
"$(OUTDIR)\DOMMemTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -145,49 +115,16 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
BSC32=bscmake.exe
BSC32_FLAGS=/o"$(OUTDIR)\DOMMemTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMMemTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMMemTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMMemTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMMemTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
LINK32_OBJS= \
"$(INTDIR)\DOMMemTest.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\DOMMemTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -230,49 +167,16 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
BSC32=bscmake.exe
BSC32_FLAGS=/o"$(OUTDIR)\DOMMemTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMMemTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMMemTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMMemTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMMemTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
LINK32_OBJS= \
"$(INTDIR)\DOMMemTest.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\DOMMemTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -313,8 +217,23 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/MD /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/MD /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\DOMMemTest.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMMemTest.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMMemTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+LINK32_OBJS= \
+ "$(INTDIR)\DOMMemTest.obj" \
+ "$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\DOMMemTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -346,24 +265,6 @@
$(CPP_PROJ) $<
<<
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMMemTest.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMMemTest.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMMemTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
-LINK32_OBJS= \
- "$(INTDIR)\DOMMemTest.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\DOMMemTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("DOMMemTest.dep")
@@ -375,7 +276,7 @@
!IF "$(CFG)" == "DOMMemTest - Win32 Release" || "$(CFG)" == "DOMMemTest - Win32 Debug" || "$(CFG)" == "DOMMemTest - Win64 Debug" || "$(CFG)" == "DOMMemTest - Win64 Release"
-SOURCE=..\..\..\..\..\tests\DOM\DOMMemTest\DOMMemTest.cpp
+SOURCE=..\..\..\..\..\tests\src\DOM\DOMMemTest\DOMMemTest.cpp
"$(INTDIR)\DOMMemTest.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
Modified: xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMNormalizerTest/DOMNormalizerTest.mak
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMNormalizerTest/DOMNormalizerTest.mak?view=diff&rev=513666&r1=513665&r2=513666
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMNormalizerTest/DOMNormalizerTest.mak (original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMNormalizerTest/DOMNormalizerTest.mak Fri Mar 2 01:02:50 2007
@@ -27,6 +27,9 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "DOMNormalizerTest - Win32 Release"
OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -60,49 +63,16 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
BSC32=bscmake.exe
BSC32_FLAGS=/o"$(OUTDIR)\DOMNormalizerTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\DOMNormalizerTest.pdb" /machine:I386 /out:"$(OUTDIR)\DOMNormalizerTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\DOMNormalizerTest.pdb" /machine:I386 /out:"$(OUTDIR)\DOMNormalizerTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
LINK32_OBJS= \
"$(INTDIR)\Normalizer.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
+ "$(OUTDIR)\xerces-c_3.lib"
"$(OUTDIR)\DOMNormalizerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -145,49 +115,16 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
BSC32=bscmake.exe
BSC32_FLAGS=/o"$(OUTDIR)\DOMNormalizerTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMNormalizerTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMNormalizerTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMNormalizerTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMNormalizerTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
LINK32_OBJS= \
"$(INTDIR)\Normalizer.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\DOMNormalizerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -230,49 +167,16 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
BSC32=bscmake.exe
BSC32_FLAGS=/o"$(OUTDIR)\DOMNormalizerTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMNormalizerTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMNormalizerTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMNormalizerTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMNormalizerTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
LINK32_OBJS= \
"$(INTDIR)\Normalizer.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\DOMNormalizerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -313,8 +217,23 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/MD /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/MD /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\DOMNormalizerTest.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMNormalizerTest.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMNormalizerTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+LINK32_OBJS= \
+ "$(INTDIR)\Normalizer.obj" \
+ "$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\DOMNormalizerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -346,24 +265,6 @@
$(CPP_PROJ) $<
<<
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMNormalizerTest.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMNormalizerTest.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMNormalizerTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
-LINK32_OBJS= \
- "$(INTDIR)\Normalizer.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\DOMNormalizerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("DOMNormalizerTest.dep")
@@ -375,7 +276,7 @@
!IF "$(CFG)" == "DOMNormalizerTest - Win32 Release" || "$(CFG)" == "DOMNormalizerTest - Win32 Debug" || "$(CFG)" == "DOMNormalizerTest - Win64 Debug" || "$(CFG)" == "DOMNormalizerTest - Win64 Release"
-SOURCE=..\..\..\..\..\tests\DOM\Normalizer\Normalizer.cpp
+SOURCE=..\..\..\..\..\tests\src\DOM\Normalizer\Normalizer.cpp
"$(INTDIR)\Normalizer.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
Modified: xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMPrint/DOMPrint.mak
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMPrint/DOMPrint.mak?view=diff&rev=513666&r1=513665&r2=513666
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMPrint/DOMPrint.mak (original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMPrint/DOMPrint.mak Fri Mar 2 01:02:50 2007
@@ -2,30 +2,33 @@
!IF "$(CFG)" == ""
CFG=DOMPrint - Win32 Debug
!MESSAGE No configuration specified. Defaulting to DOMPrint - Win32 Debug.
-!ENDIF
+!ENDIF
!IF "$(CFG)" != "DOMPrint - Win32 Release" && "$(CFG)" != "DOMPrint - Win32 Debug" && "$(CFG)" != "DOMPrint - Win64 Debug" && "$(CFG)" != "DOMPrint - Win64 Release"
!MESSAGE Invalid configuration "$(CFG)" specified.
!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 "DOMPrint.mak" CFG="DOMPrint - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "DOMPrint - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "DOMPrint - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "DOMPrint - Win64 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "DOMPrint - Win64 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
!ERROR An invalid configuration is specified.
-!ENDIF
+!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
-!ELSE
+!ELSE
NULL=nul
-!ENDIF
+!ENDIF
+
+CPP=cl.exe
+RSC=rc.exe
!IF "$(CFG)" == "DOMPrint - Win32 Release"
@@ -35,25 +38,31 @@
OutDir=.\..\..\..\..\..\Build\Win32\VC6\Release
# End Custom Macros
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0"
-ALL : "$(OUTDIR)\DOMPrint.exe"
+ALL : "$(OUTDIR)\DOMPrint.exe" "$(OUTDIR)\DOMPrint.bsc"
+
+!ELSE
-!ELSE
+ALL : "XercesLib - Win32 Release" "$(OUTDIR)\DOMPrint.exe" "$(OUTDIR)\DOMPrint.bsc"
-ALL : "XercesLib - Win32 Release" "$(OUTDIR)\DOMPrint.exe"
-!ENDIF
+!ENDIF
-!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win32 ReleaseCLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1"
+CLEAN :"XercesLib - Win32 ReleaseCLEAN"
+!ELSE
CLEAN :
-!ENDIF
+!ENDIF
-@erase "$(INTDIR)\DOMPrint.obj"
+ -@erase "$(INTDIR)\DOMPrint.sbr"
-@erase "$(INTDIR)\DOMPrintErrorHandler.obj"
+ -@erase "$(INTDIR)\DOMPrintErrorHandler.sbr"
-@erase "$(INTDIR)\DOMPrintFilter.obj"
+ -@erase "$(INTDIR)\DOMPrintFilter.sbr"
-@erase "$(INTDIR)\DOMTreeErrorReporter.obj"
+ -@erase "$(INTDIR)\DOMTreeErrorReporter.sbr"
-@erase "$(INTDIR)\vc60.idb"
+ -@erase "$(OUTDIR)\DOMPrint.bsc"
-@erase "$(OUTDIR)\DOMPrint.exe"
-@erase "$(OUTDIR)\DOMPrint.ilk"
@@ -63,52 +72,28 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMPrint.bsc"
+BSC32_FLAGS=/o"$(OUTDIR)\DOMPrint.bsc"
BSC32_SBRS= \
+ "$(INTDIR)\DOMPrint.sbr" \
+ "$(INTDIR)\DOMPrintErrorHandler.sbr" \
+ "$(INTDIR)\DOMPrintFilter.sbr" \
+ "$(INTDIR)\DOMTreeErrorReporter.sbr"
+
+"$(OUTDIR)\DOMPrint.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+ $(BSC32) @<<
+ $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMPrint.pdb" /machine:I386 /out:"$(OUTDIR)\DOMPrint.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMPrint.pdb" /machine:I386 /out:"$(OUTDIR)\DOMPrint.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
LINK32_OBJS= \
"$(INTDIR)\DOMPrint.obj" \
"$(INTDIR)\DOMPrintErrorHandler.obj" \
"$(INTDIR)\DOMPrintFilter.obj" \
"$(INTDIR)\DOMTreeErrorReporter.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
+ "$(OUTDIR)\xerces-c_3.lib"
"$(OUTDIR)\DOMPrint.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -123,21 +108,21 @@
OutDir=.\..\..\..\..\..\Build\Win32\VC6\Debug
# End Custom Macros
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\DOMPrint.exe"
-!ELSE
+!ELSE
ALL : "XercesLib - Win32 Debug" "$(OUTDIR)\DOMPrint.exe"
-!ENDIF
+!ENDIF
-!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win32 DebugCLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1"
+CLEAN :"XercesLib - Win32 DebugCLEAN"
+!ELSE
CLEAN :
-!ENDIF
+!ENDIF
-@erase "$(INTDIR)\DOMPrint.obj"
-@erase "$(INTDIR)\DOMPrintErrorHandler.obj"
-@erase "$(INTDIR)\DOMPrintFilter.obj"
@@ -154,52 +139,19 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMPrint.bsc"
+BSC32_FLAGS=/o"$(OUTDIR)\DOMPrint.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMPrint.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMPrint.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMPrint.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMPrint.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
LINK32_OBJS= \
"$(INTDIR)\DOMPrint.obj" \
"$(INTDIR)\DOMPrintErrorHandler.obj" \
"$(INTDIR)\DOMPrintFilter.obj" \
"$(INTDIR)\DOMTreeErrorReporter.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\DOMPrint.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -214,21 +166,21 @@
OutDir=.\..\..\..\..\..\Build\Win64\VC6\Debug
# End Custom Macros
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\DOMPrint.exe"
-!ELSE
+!ELSE
ALL : "XercesLib - Win64 Debug" "$(OUTDIR)\DOMPrint.exe"
-!ENDIF
+!ENDIF
-!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win64 DebugCLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1"
+CLEAN :"XercesLib - Win64 DebugCLEAN"
+!ELSE
CLEAN :
-!ENDIF
+!ENDIF
-@erase "$(INTDIR)\DOMPrint.obj"
-@erase "$(INTDIR)\DOMPrintErrorHandler.obj"
-@erase "$(INTDIR)\DOMPrintFilter.obj"
@@ -245,52 +197,19 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMPrint.bsc"
+BSC32_FLAGS=/o"$(OUTDIR)\DOMPrint.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMPrint.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMPrint.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMPrint.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMPrint.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
LINK32_OBJS= \
"$(INTDIR)\DOMPrint.obj" \
"$(INTDIR)\DOMPrintErrorHandler.obj" \
"$(INTDIR)\DOMPrintFilter.obj" \
"$(INTDIR)\DOMTreeErrorReporter.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\DOMPrint.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -305,26 +224,31 @@
OutDir=.\..\..\..\..\..\Build\Win64\VC6\Release
# End Custom Macros
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0"
-ALL : "$(OUTDIR)\DOMPrint.exe"
+ALL : "$(OUTDIR)\DOMPrint.exe" "$(OUTDIR)\DOMPrint.bsc"
-!ELSE
+!ELSE
-ALL : "XercesLib - Win64 Release" "$(OUTDIR)\DOMPrint.exe"
+ALL : "XercesLib - Win64 Release" "$(OUTDIR)\DOMPrint.exe" "$(OUTDIR)\DOMPrint.bsc"
-!ENDIF
+!ENDIF
-!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win64 ReleaseCLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1"
+CLEAN :"XercesLib - Win64 ReleaseCLEAN"
+!ELSE
CLEAN :
-!ENDIF
+!ENDIF
-@erase "$(INTDIR)\DOMPrint.obj"
+ -@erase "$(INTDIR)\DOMPrint.sbr"
-@erase "$(INTDIR)\DOMPrintErrorHandler.obj"
+ -@erase "$(INTDIR)\DOMPrintErrorHandler.sbr"
-@erase "$(INTDIR)\DOMPrintFilter.obj"
+ -@erase "$(INTDIR)\DOMPrintFilter.sbr"
-@erase "$(INTDIR)\DOMTreeErrorReporter.obj"
+ -@erase "$(INTDIR)\DOMTreeErrorReporter.sbr"
-@erase "$(INTDIR)\vc60.idb"
+ -@erase "$(OUTDIR)\DOMPrint.bsc"
-@erase "$(OUTDIR)\DOMPrint.exe"
-@erase "$(OUTDIR)\DOMPrint.ilk"
@@ -334,143 +258,256 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\DOMPrint.bsc"
+BSC32_SBRS= \
+ "$(INTDIR)\DOMPrint.sbr" \
+ "$(INTDIR)\DOMPrintErrorHandler.sbr" \
+ "$(INTDIR)\DOMPrintFilter.sbr" \
+ "$(INTDIR)\DOMTreeErrorReporter.sbr"
+
+"$(OUTDIR)\DOMPrint.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+ $(BSC32) @<<
+ $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMPrint.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMPrint.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+LINK32_OBJS= \
+ "$(INTDIR)\DOMPrint.obj" \
+ "$(INTDIR)\DOMPrintErrorHandler.obj" \
+ "$(INTDIR)\DOMPrintFilter.obj" \
+ "$(INTDIR)\DOMTreeErrorReporter.obj" \
+ "$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\DOMPrint.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
.c{$(INTDIR)}.obj::
$(CPP) @<<
- $(CPP_PROJ) $<
+ $(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.obj::
$(CPP) @<<
- $(CPP_PROJ) $<
+ $(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
- $(CPP_PROJ) $<
+ $(CPP_PROJ) $<
<<
.c{$(INTDIR)}.sbr::
$(CPP) @<<
- $(CPP_PROJ) $<
+ $(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.sbr::
$(CPP) @<<
- $(CPP_PROJ) $<
+ $(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.sbr::
$(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMPrint.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMPrint.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMPrint.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
-LINK32_OBJS= \
- "$(INTDIR)\DOMPrint.obj" \
- "$(INTDIR)\DOMPrintErrorHandler.obj" \
- "$(INTDIR)\DOMPrintFilter.obj" \
- "$(INTDIR)\DOMTreeErrorReporter.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\DOMPrint.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
+ $(CPP_PROJ) $<
<<
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("DOMPrint.dep")
!INCLUDE "DOMPrint.dep"
-!ELSE
+!ELSE
!MESSAGE Warning: cannot find "DOMPrint.dep"
-!ENDIF
-!ENDIF
+!ENDIF
+!ENDIF
!IF "$(CFG)" == "DOMPrint - Win32 Release" || "$(CFG)" == "DOMPrint - Win32 Debug" || "$(CFG)" == "DOMPrint - Win64 Debug" || "$(CFG)" == "DOMPrint - Win64 Release"
!IF "$(CFG)" == "DOMPrint - Win32 Release"
-"XercesLib - Win32 Release" :
+"XercesLib - Win32 Release" :
cd "..\XercesLib"
- $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Release"
+ $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Release"
cd "..\DOMPrint"
-"XercesLib - Win32 ReleaseCLEAN" :
+"XercesLib - Win32 ReleaseCLEAN" :
cd "..\XercesLib"
- $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Release" RECURSE=1 CLEAN
+ $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Release" RECURSE=1 CLEAN
cd "..\DOMPrint"
!ELSEIF "$(CFG)" == "DOMPrint - Win32 Debug"
-"XercesLib - Win32 Debug" :
+"XercesLib - Win32 Debug" :
cd "..\XercesLib"
- $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug"
+ $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug"
cd "..\DOMPrint"
-"XercesLib - Win32 DebugCLEAN" :
+"XercesLib - Win32 DebugCLEAN" :
cd "..\XercesLib"
- $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug" RECURSE=1 CLEAN
+ $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug" RECURSE=1 CLEAN
cd "..\DOMPrint"
!ELSEIF "$(CFG)" == "DOMPrint - Win64 Debug"
-"XercesLib - Win64 Debug" :
+"XercesLib - Win64 Debug" :
cd "..\XercesLib"
- $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug"
+ $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug"
cd "..\DOMPrint"
-"XercesLib - Win64 DebugCLEAN" :
+"XercesLib - Win64 DebugCLEAN" :
cd "..\XercesLib"
- $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug" RECURSE=1 CLEAN
+ $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug" RECURSE=1 CLEAN
cd "..\DOMPrint"
!ELSEIF "$(CFG)" == "DOMPrint - Win64 Release"
-"XercesLib - Win64 Release" :
+"XercesLib - Win64 Release" :
cd "..\XercesLib"
- $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Release"
+ $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Release"
cd "..\DOMPrint"
-"XercesLib - Win64 ReleaseCLEAN" :
+"XercesLib - Win64 ReleaseCLEAN" :
cd "..\XercesLib"
- $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Release" RECURSE=1 CLEAN
+ $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Release" RECURSE=1 CLEAN
cd "..\DOMPrint"
-!ENDIF
+!ENDIF
+
+SOURCE=..\..\..\..\..\samples\src\DOMPrint\DOMPrint.cpp
+
+!IF "$(CFG)" == "DOMPrint - Win32 Release"
+
+
+"$(INTDIR)\DOMPrint.obj" "$(INTDIR)\DOMPrint.sbr" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "DOMPrint - Win32 Debug"
-SOURCE=..\..\..\..\..\samples\DOMPrint\DOMPrint.cpp
"$(INTDIR)\DOMPrint.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\..\..\..\samples\DOMPrint\DOMPrintErrorHandler.cpp
+!ELSEIF "$(CFG)" == "DOMPrint - Win64 Debug"
+
+
+"$(INTDIR)\DOMPrint.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "DOMPrint - Win64 Release"
+
+
+"$(INTDIR)\DOMPrint.obj" "$(INTDIR)\DOMPrint.sbr" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
+SOURCE=..\..\..\..\..\samples\src\DOMPrint\DOMPrintErrorHandler.cpp
+
+!IF "$(CFG)" == "DOMPrint - Win32 Release"
+
+
+"$(INTDIR)\DOMPrintErrorHandler.obj" "$(INTDIR)\DOMPrintErrorHandler.sbr" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "DOMPrint - Win32 Debug"
+
"$(INTDIR)\DOMPrintErrorHandler.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\..\..\..\samples\DOMPrint\DOMPrintFilter.cpp
+
+!ELSEIF "$(CFG)" == "DOMPrint - Win64 Debug"
+
+
+"$(INTDIR)\DOMPrintErrorHandler.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "DOMPrint - Win64 Release"
+
+
+"$(INTDIR)\DOMPrintErrorHandler.obj" "$(INTDIR)\DOMPrintErrorHandler.sbr" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
+SOURCE=..\..\..\..\..\samples\src\DOMPrint\DOMPrintFilter.cpp
+
+!IF "$(CFG)" == "DOMPrint - Win32 Release"
+
+
+"$(INTDIR)\DOMPrintFilter.obj" "$(INTDIR)\DOMPrintFilter.sbr" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "DOMPrint - Win32 Debug"
+
"$(INTDIR)\DOMPrintFilter.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\..\..\..\samples\DOMPrint\DOMTreeErrorReporter.cpp
+
+!ELSEIF "$(CFG)" == "DOMPrint - Win64 Debug"
+
+
+"$(INTDIR)\DOMPrintFilter.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "DOMPrint - Win64 Release"
+
+
+"$(INTDIR)\DOMPrintFilter.obj" "$(INTDIR)\DOMPrintFilter.sbr" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
+SOURCE=..\..\..\..\..\samples\src\DOMPrint\DOMTreeErrorReporter.cpp
+
+!IF "$(CFG)" == "DOMPrint - Win32 Release"
+
+
+"$(INTDIR)\DOMTreeErrorReporter.obj" "$(INTDIR)\DOMTreeErrorReporter.sbr" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "DOMPrint - Win32 Debug"
+
+
+"$(INTDIR)\DOMTreeErrorReporter.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "DOMPrint - Win64 Debug"
+
"$(INTDIR)\DOMTreeErrorReporter.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ENDIF
+!ELSEIF "$(CFG)" == "DOMPrint - Win64 Release"
+
+
+"$(INTDIR)\DOMTreeErrorReporter.obj" "$(INTDIR)\DOMTreeErrorReporter.sbr" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
+
+!ENDIF
Modified: xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMTest/DOMTest.mak
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMTest/DOMTest.mak?view=diff&rev=513666&r1=513665&r2=513666
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMTest/DOMTest.mak (original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMTest/DOMTest.mak Fri Mar 2 01:02:50 2007
@@ -27,6 +27,9 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "DOMTest - Win32 Release"
OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -60,49 +63,16 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
BSC32=bscmake.exe
BSC32_FLAGS=/o"$(OUTDIR)\DOMTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\DOMTest.pdb" /machine:I386 /out:"$(OUTDIR)\DOMTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\DOMTest.pdb" /machine:I386 /out:"$(OUTDIR)\DOMTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
LINK32_OBJS= \
"$(INTDIR)\DTest.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
+ "$(OUTDIR)\xerces-c_3.lib"
"$(OUTDIR)\DOMTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -145,49 +115,16 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
BSC32=bscmake.exe
BSC32_FLAGS=/o"$(OUTDIR)\DOMTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
LINK32_OBJS= \
"$(INTDIR)\DTest.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\DOMTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -230,49 +167,16 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
BSC32=bscmake.exe
BSC32_FLAGS=/o"$(OUTDIR)\DOMTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
LINK32_OBJS= \
"$(INTDIR)\DTest.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\DOMTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -313,8 +217,23 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\DOMTest.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTest.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+LINK32_OBJS= \
+ "$(INTDIR)\DTest.obj" \
+ "$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\DOMTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -346,24 +265,6 @@
$(CPP_PROJ) $<
<<
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMTest.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTest.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
-LINK32_OBJS= \
- "$(INTDIR)\DTest.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\DOMTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("DOMTest.dep")
@@ -375,7 +276,7 @@
!IF "$(CFG)" == "DOMTest - Win32 Release" || "$(CFG)" == "DOMTest - Win32 Debug" || "$(CFG)" == "DOMTest - Win64 Debug" || "$(CFG)" == "DOMTest - Win64 Release"
-SOURCE=..\..\..\..\..\tests\DOM\DOMTest\DTest.cpp
+SOURCE=..\..\..\..\..\tests\src\DOM\DOMTest\DTest.cpp
"$(INTDIR)\DTest.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
Modified: xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMTraversalTest/DOMTraversalTest.mak
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMTraversalTest/DOMTraversalTest.mak?view=diff&rev=513666&r1=513665&r2=513666
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMTraversalTest/DOMTraversalTest.mak (original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMTraversalTest/DOMTraversalTest.mak Fri Mar 2 01:02:50 2007
@@ -27,6 +27,9 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "DOMTraversalTest - Win32 Release"
OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -60,49 +63,16 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
BSC32=bscmake.exe
BSC32_FLAGS=/o"$(OUTDIR)\DOMTraversalTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\DOMTraversalTest.pdb" /machine:I386 /out:"$(OUTDIR)\DOMTraversalTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\DOMTraversalTest.pdb" /machine:I386 /out:"$(OUTDIR)\DOMTraversalTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
LINK32_OBJS= \
"$(INTDIR)\Traversal.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
+ "$(OUTDIR)\xerces-c_3.lib"
"$(OUTDIR)\DOMTraversalTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -145,49 +115,16 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
BSC32=bscmake.exe
BSC32_FLAGS=/o"$(OUTDIR)\DOMTraversalTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTraversalTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMTraversalTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTraversalTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMTraversalTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
LINK32_OBJS= \
"$(INTDIR)\Traversal.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\DOMTraversalTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -230,49 +167,16 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
BSC32=bscmake.exe
BSC32_FLAGS=/o"$(OUTDIR)\DOMTraversalTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTraversalTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMTraversalTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTraversalTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMTraversalTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
LINK32_OBJS= \
"$(INTDIR)\Traversal.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\DOMTraversalTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -313,8 +217,23 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\DOMTraversalTest.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTraversalTest.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMTraversalTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+LINK32_OBJS= \
+ "$(INTDIR)\Traversal.obj" \
+ "$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\DOMTraversalTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -346,24 +265,6 @@
$(CPP_PROJ) $<
<<
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMTraversalTest.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTraversalTest.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMTraversalTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
-LINK32_OBJS= \
- "$(INTDIR)\Traversal.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\DOMTraversalTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("DOMTraversalTest.dep")
@@ -375,7 +276,7 @@
!IF "$(CFG)" == "DOMTraversalTest - Win32 Release" || "$(CFG)" == "DOMTraversalTest - Win32 Debug" || "$(CFG)" == "DOMTraversalTest - Win64 Debug" || "$(CFG)" == "DOMTraversalTest - Win64 Release"
-SOURCE=..\..\..\..\..\tests\DOM\Traversal\Traversal.cpp
+SOURCE=..\..\..\..\..\tests\src\DOM\Traversal\Traversal.cpp
"$(INTDIR)\Traversal.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org