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 [2/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...
Modified: xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.mak
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.mak?view=diff&rev=513666&r1=513665&r2=513666
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.mak (original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.mak Fri Mar 2 01:02:50 2007
@@ -2,30 +2,33 @@
!IF "$(CFG)" == ""
CFG=DOMTypeInfoTest - Win32 Debug
!MESSAGE No configuration specified. Defaulting to DOMTypeInfoTest - Win32 Debug.
-!ENDIF
+!ENDIF
!IF "$(CFG)" != "DOMTypeInfoTest - Win32 Release" && "$(CFG)" != "DOMTypeInfoTest - Win32 Debug" && "$(CFG)" != "DOMTypeInfoTest - Win64 Debug" && "$(CFG)" != "DOMTypeInfoTest - 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 "DOMTypeInfoTest.mak" CFG="DOMTypeInfoTest - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "DOMTypeInfoTest - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "DOMTypeInfoTest - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "DOMTypeInfoTest - Win64 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "DOMTypeInfoTest - 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)" == "DOMTypeInfoTest - Win32 Release"
@@ -35,21 +38,21 @@
OutDir=.\..\..\..\..\..\Build\Win32\VC6\Release
# End Custom Macros
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\DOMTypeInfoTest.exe"
-!ELSE
+!ELSE
ALL : "XercesLib - Win32 Release" "$(OUTDIR)\DOMTypeInfoTest.exe"
-!ENDIF
+!ENDIF
-!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win32 ReleaseCLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1"
+CLEAN :"XercesLib - Win32 ReleaseCLEAN"
+!ELSE
CLEAN :
-!ENDIF
+!ENDIF
-@erase "$(INTDIR)\TypeInfo.obj"
-@erase "$(INTDIR)\vc60.idb"
-@erase "$(OUTDIR)\DOMTypeInfoTest.exe"
@@ -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 /Zm1000 /c
BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMTypeInfoTest.bsc"
+BSC32_FLAGS=/o"$(OUTDIR)\DOMTypeInfoTest.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)\DOMTypeInfoTest.pdb" /machine:I386 /out:"$(OUTDIR)\DOMTypeInfoTest.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)\DOMTypeInfoTest.pdb" /machine:I386 /out:"$(OUTDIR)\DOMTypeInfoTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
LINK32_OBJS= \
"$(INTDIR)\TypeInfo.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
+ "$(OUTDIR)\xerces-c_3.lib"
"$(OUTDIR)\DOMTypeInfoTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -117,21 +87,21 @@
OutDir=.\..\..\..\..\..\Build\Win32\VC6\Debug
# End Custom Macros
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\DOMTypeInfoTest.exe"
-!ELSE
+!ELSE
ALL : "XercesLib - Win32 Debug" "$(OUTDIR)\DOMTypeInfoTest.exe"
-!ENDIF
+!ENDIF
-!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win32 DebugCLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1"
+CLEAN :"XercesLib - Win32 DebugCLEAN"
+!ELSE
CLEAN :
-!ENDIF
+!ENDIF
-@erase "$(INTDIR)\TypeInfo.obj"
-@erase "$(INTDIR)\vc60.idb"
-@erase "$(INTDIR)\vc60.pdb"
@@ -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 /Zm1000 /c
BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMTypeInfoTest.bsc"
+BSC32_FLAGS=/o"$(OUTDIR)\DOMTypeInfoTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTypeInfoTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMTypeInfoTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTypeInfoTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\DOMTypeInfoTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
LINK32_OBJS= \
"$(INTDIR)\TypeInfo.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\DOMTypeInfoTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -202,21 +139,21 @@
OutDir=.\..\..\..\..\..\Build\Win64\VC6\Debug
# End Custom Macros
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\DOMTypeInfoTest.exe"
-!ELSE
+!ELSE
ALL : "XercesLib - Win64 Debug" "$(OUTDIR)\DOMTypeInfoTest.exe"
-!ENDIF
+!ENDIF
-!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win64 DebugCLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1"
+CLEAN :"XercesLib - Win64 DebugCLEAN"
+!ELSE
CLEAN :
-!ENDIF
+!ENDIF
-@erase "$(INTDIR)\TypeInfo.obj"
-@erase "$(INTDIR)\vc60.idb"
-@erase "$(INTDIR)\vc60.pdb"
@@ -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 /Zm1000 /c
BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\DOMTypeInfoTest.bsc"
+BSC32_FLAGS=/o"$(OUTDIR)\DOMTypeInfoTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\DOMTypeInfoTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMTypeInfoTest.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)\DOMTypeInfoTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\DOMTypeInfoTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
LINK32_OBJS= \
"$(INTDIR)\TypeInfo.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\DOMTypeInfoTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -287,21 +191,21 @@
OutDir=.\..\..\..\..\..\Build\Win64\VC6\Release
# End Custom Macros
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\DOMTypeInfoTest.exe"
-!ELSE
+!ELSE
ALL : "XercesLib - Win64 Release" "$(OUTDIR)\DOMTypeInfoTest.exe"
-!ENDIF
+!ENDIF
-!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win64 ReleaseCLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1"
+CLEAN :"XercesLib - Win64 ReleaseCLEAN"
+!ELSE
CLEAN :
-!ENDIF
+!ENDIF
-@erase "$(INTDIR)\TypeInfo.obj"
-@erase "$(INTDIR)\vc60.idb"
-@erase "$(OUTDIR)\DOMTypeInfoTest.exe"
@@ -313,69 +217,66 @@
"$(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 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /Zm1000 /c
+BSC32=bscmake.exe
+BSC32_FLAGS=/o"$(OUTDIR)\DOMTypeInfoTest.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)\DOMTypeInfoTest.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMTypeInfoTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+LINK32_OBJS= \
+ "$(INTDIR)\TypeInfo.obj" \
+ "$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\DOMTypeInfoTest.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)\DOMTypeInfoTest.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)\DOMTypeInfoTest.pdb" /machine:IX86 /out:"$(OUTDIR)\DOMTypeInfoTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
-LINK32_OBJS= \
- "$(INTDIR)\TypeInfo.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\DOMTypeInfoTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
+ $(CPP_PROJ) $<
<<
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("DOMTypeInfoTest.dep")
!INCLUDE "DOMTypeInfoTest.dep"
-!ELSE
+!ELSE
!MESSAGE Warning: cannot find "DOMTypeInfoTest.dep"
-!ENDIF
-!ENDIF
+!ENDIF
+!ENDIF
!IF "$(CFG)" == "DOMTypeInfoTest - Win32 Release" || "$(CFG)" == "DOMTypeInfoTest - Win32 Debug" || "$(CFG)" == "DOMTypeInfoTest - Win64 Debug" || "$(CFG)" == "DOMTypeInfoTest - Win64 Release"
-SOURCE=..\..\..\..\..\tests\DOM\TypeInfo\TypeInfo.cpp
+SOURCE=..\..\..\..\..\tests\src\DOM\TypeInfo\TypeInfo.cpp
"$(INTDIR)\TypeInfo.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -383,54 +284,54 @@
!IF "$(CFG)" == "DOMTypeInfoTest - 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 "..\DOMTypeInfoTest"
-"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 "..\DOMTypeInfoTest"
!ELSEIF "$(CFG)" == "DOMTypeInfoTest - 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 "..\DOMTypeInfoTest"
-"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 "..\DOMTypeInfoTest"
!ELSEIF "$(CFG)" == "DOMTypeInfoTest - 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 "..\DOMTypeInfoTest"
-"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 "..\DOMTypeInfoTest"
!ELSEIF "$(CFG)" == "DOMTypeInfoTest - 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 "..\DOMTypeInfoTest"
-"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 "..\DOMTypeInfoTest"
-!ENDIF
+!ENDIF
-!ENDIF
+!ENDIF
Modified: xerces/c/trunk/Projects/Win32/VC6/xerces-all/EncodingTest/EncodingTest.mak
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC6/xerces-all/EncodingTest/EncodingTest.mak?view=diff&rev=513666&r1=513665&r2=513666
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/EncodingTest/EncodingTest.mak (original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/EncodingTest/EncodingTest.mak Fri Mar 2 01:02:50 2007
@@ -27,6 +27,9 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "EncodingTest - 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)\EncodingTest.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)\EncodingTest.pdb" /machine:I386 /out:"$(OUTDIR)\EncodingTest.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)\EncodingTest.pdb" /machine:I386 /out:"$(OUTDIR)\EncodingTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
LINK32_OBJS= \
"$(INTDIR)\EncodingTest.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
+ "$(OUTDIR)\xerces-c_3.lib"
"$(OUTDIR)\EncodingTest.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)\EncodingTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\EncodingTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\EncodingTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\EncodingTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\EncodingTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
LINK32_OBJS= \
"$(INTDIR)\EncodingTest.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\EncodingTest.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)\EncodingTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\EncodingTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\EncodingTest.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)\EncodingTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\EncodingTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
LINK32_OBJS= \
"$(INTDIR)\EncodingTest.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\EncodingTest.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)\EncodingTest.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)\EncodingTest.pdb" /machine:IX86 /out:"$(OUTDIR)\EncodingTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+LINK32_OBJS= \
+ "$(INTDIR)\EncodingTest.obj" \
+ "$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\EncodingTest.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)\EncodingTest.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)\EncodingTest.pdb" /machine:IX86 /out:"$(OUTDIR)\EncodingTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
-LINK32_OBJS= \
- "$(INTDIR)\EncodingTest.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\EncodingTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("EncodingTest.dep")
@@ -375,7 +276,7 @@
!IF "$(CFG)" == "EncodingTest - Win32 Release" || "$(CFG)" == "EncodingTest - Win32 Debug" || "$(CFG)" == "EncodingTest - Win64 Debug" || "$(CFG)" == "EncodingTest - Win64 Release"
-SOURCE=..\..\..\..\..\tests\EncodingTest\EncodingTest.cpp
+SOURCE=..\..\..\..\..\tests\src\EncodingTest\EncodingTest.cpp
"$(INTDIR)\EncodingTest.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
Modified: xerces/c/trunk/Projects/Win32/VC6/xerces-all/EnumVal/EnumVal.mak
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC6/xerces-all/EnumVal/EnumVal.mak?view=diff&rev=513666&r1=513665&r2=513666
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/EnumVal/EnumVal.mak (original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/EnumVal/EnumVal.mak Fri Mar 2 01:02:50 2007
@@ -27,6 +27,9 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "EnumVal - 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 "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)\EnumVal.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)\EnumVal.pdb" /machine:I386 /out:"$(OUTDIR)\EnumVal.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)\EnumVal.pdb" /machine:I386 /out:"$(OUTDIR)\EnumVal.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
LINK32_OBJS= \
"$(INTDIR)\EnumVal.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
+ "$(OUTDIR)\xerces-c_3.lib"
"$(OUTDIR)\EnumVal.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 "_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)\EnumVal.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)\EnumVal.pdb" /debug /machine:I386 /out:"$(OUTDIR)\EnumVal.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)\EnumVal.pdb" /debug /machine:I386 /out:"$(OUTDIR)\EnumVal.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
LINK32_OBJS= \
"$(INTDIR)\EnumVal.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\EnumVal.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 "_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)\EnumVal.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)\EnumVal.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\EnumVal.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)\EnumVal.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\EnumVal.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
LINK32_OBJS= \
"$(INTDIR)\EnumVal.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\EnumVal.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 "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)\EnumVal.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)\EnumVal.pdb" /machine:IX86 /out:"$(OUTDIR)\EnumVal.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+LINK32_OBJS= \
+ "$(INTDIR)\EnumVal.obj" \
+ "$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\EnumVal.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)\EnumVal.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)\EnumVal.pdb" /machine:IX86 /out:"$(OUTDIR)\EnumVal.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
-LINK32_OBJS= \
- "$(INTDIR)\EnumVal.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\EnumVal.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("EnumVal.dep")
@@ -427,7 +328,7 @@
!ENDIF
-SOURCE=..\..\..\..\..\samples\EnumVal\EnumVal.cpp
+SOURCE=..\..\..\..\..\samples\src\EnumVal\EnumVal.cpp
"$(INTDIR)\EnumVal.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
Modified: xerces/c/trunk/Projects/Win32/VC6/xerces-all/InitTermTest/InitTermTest.mak
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC6/xerces-all/InitTermTest/InitTermTest.mak?view=diff&rev=513666&r1=513665&r2=513666
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/InitTermTest/InitTermTest.mak (original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/InitTermTest/InitTermTest.mak Fri Mar 2 01:02:50 2007
@@ -27,6 +27,9 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "InitTermTest - 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)\InitTermTest.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)\InitTermTest.pdb" /machine:I386 /out:"$(OUTDIR)\InitTermTest.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)\InitTermTest.pdb" /machine:I386 /out:"$(OUTDIR)\InitTermTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
LINK32_OBJS= \
"$(INTDIR)\InitTermTest.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
+ "$(OUTDIR)\xerces-c_3.lib"
"$(OUTDIR)\InitTermTest.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)\InitTermTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\InitTermTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\InitTermTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\InitTermTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\InitTermTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
LINK32_OBJS= \
"$(INTDIR)\InitTermTest.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\InitTermTest.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)\InitTermTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\InitTermTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\InitTermTest.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)\InitTermTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\InitTermTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
LINK32_OBJS= \
"$(INTDIR)\InitTermTest.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\InitTermTest.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)\InitTermTest.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)\InitTermTest.pdb" /machine:IX86 /out:"$(OUTDIR)\InitTermTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+LINK32_OBJS= \
+ "$(INTDIR)\InitTermTest.obj" \
+ "$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\InitTermTest.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)\InitTermTest.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)\InitTermTest.pdb" /machine:IX86 /out:"$(OUTDIR)\InitTermTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
-LINK32_OBJS= \
- "$(INTDIR)\InitTermTest.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\InitTermTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("InitTermTest.dep")
@@ -375,7 +276,7 @@
!IF "$(CFG)" == "InitTermTest - Win32 Release" || "$(CFG)" == "InitTermTest - Win32 Debug" || "$(CFG)" == "InitTermTest - Win64 Debug" || "$(CFG)" == "InitTermTest - Win64 Release"
-SOURCE=..\..\..\..\..\tests\InitTermTest\InitTermTest.cpp
+SOURCE=..\..\..\..\..\tests\src\InitTermTest\InitTermTest.cpp
"$(INTDIR)\InitTermTest.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
Modified: xerces/c/trunk/Projects/Win32/VC6/xerces-all/MemHandlerTest/MemHandlerTest.mak
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC6/xerces-all/MemHandlerTest/MemHandlerTest.mak?view=diff&rev=513666&r1=513665&r2=513666
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/MemHandlerTest/MemHandlerTest.mak (original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/MemHandlerTest/MemHandlerTest.mak Fri Mar 2 01:02:50 2007
@@ -27,6 +27,9 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "MemHandlerTest - Win32 Release"
OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -41,12 +44,12 @@
!ELSE
-ALL : "XercesDeprecatedDOMLib - Win32 Release" "XercesLib - Win32 Release" "$(OUTDIR)\MemHandlerTest.exe"
+ALL : "XercesLib - Win32 Release" "$(OUTDIR)\MemHandlerTest.exe"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win32 ReleaseCLEAN" "XercesDeprecatedDOMLib - Win32 ReleaseCLEAN"
+CLEAN :"XercesLib - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -61,51 +64,17 @@
"$(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)\MemHandlerTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib xerces-depdom_2.lib /version:1.0 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\MemHandlerTest.pdb" /machine:I386 /out:"$(OUTDIR)\MemHandlerTest.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)\MemHandlerTest.pdb" /machine:I386 /out:"$(OUTDIR)\MemHandlerTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
LINK32_OBJS= \
"$(INTDIR)\MemoryMonitor.obj" \
"$(INTDIR)\SimpleHashPtr.obj" \
- "$(OUTDIR)\xerces-c_2.lib" \
- "$(OUTDIR)\xerces-depdom_2.lib"
+ "$(OUTDIR)\xerces-c_3.lib"
"$(OUTDIR)\MemHandlerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -126,12 +95,12 @@
!ELSE
-ALL : "XercesDeprecatedDOMLib - Win32 Debug" "XercesLib - Win32 Debug" "$(OUTDIR)\MemHandlerTest.exe"
+ALL : "XercesLib - Win32 Debug" "$(OUTDIR)\MemHandlerTest.exe"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win32 DebugCLEAN" "XercesDeprecatedDOMLib - Win32 DebugCLEAN"
+CLEAN :"XercesLib - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -149,51 +118,17 @@
"$(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)\MemHandlerTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib xerces-depdom_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\MemHandlerTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\MemHandlerTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\MemHandlerTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\MemHandlerTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
LINK32_OBJS= \
"$(INTDIR)\MemoryMonitor.obj" \
"$(INTDIR)\SimpleHashPtr.obj" \
- "$(OUTDIR)\xerces-c_2D.lib" \
- "$(OUTDIR)\xerces-depdom_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\MemHandlerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -214,12 +149,12 @@
!ELSE
-ALL : "XercesDeprecatedDOMLib - Win64 Debug" "XercesLib - Win64 Debug" "$(OUTDIR)\MemHandlerTest.exe"
+ALL : "XercesLib - Win64 Debug" "$(OUTDIR)\MemHandlerTest.exe"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win64 DebugCLEAN" "XercesDeprecatedDOMLib - Win64 DebugCLEAN"
+CLEAN :"XercesLib - Win64 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -237,51 +172,17 @@
"$(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)\MemHandlerTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib xerces-depdom_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\MemHandlerTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\MemHandlerTest.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)\MemHandlerTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\MemHandlerTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
LINK32_OBJS= \
"$(INTDIR)\MemoryMonitor.obj" \
"$(INTDIR)\SimpleHashPtr.obj" \
- "$(OUTDIR)\xerces-c_2D.lib" \
- "$(OUTDIR)\xerces-depdom_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\MemHandlerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -302,12 +203,12 @@
!ELSE
-ALL : "XercesDeprecatedDOMLib - Win64 Release" "XercesLib - Win64 Release" "$(OUTDIR)\MemHandlerTest.exe"
+ALL : "XercesLib - Win64 Release" "$(OUTDIR)\MemHandlerTest.exe"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"XercesLib - Win64 ReleaseCLEAN" "XercesDeprecatedDOMLib - Win64 ReleaseCLEAN"
+CLEAN :"XercesLib - Win64 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -323,8 +224,24 @@
"$(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)\MemHandlerTest.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)\MemHandlerTest.pdb" /machine:IX86 /out:"$(OUTDIR)\MemHandlerTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+LINK32_OBJS= \
+ "$(INTDIR)\MemoryMonitor.obj" \
+ "$(INTDIR)\SimpleHashPtr.obj" \
+ "$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\MemHandlerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -356,26 +273,6 @@
$(CPP_PROJ) $<
<<
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\MemHandlerTest.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib xerces-depdom_2.lib /version:1.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\MemHandlerTest.pdb" /machine:IX86 /out:"$(OUTDIR)\MemHandlerTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
-LINK32_OBJS= \
- "$(INTDIR)\MemoryMonitor.obj" \
- "$(INTDIR)\SimpleHashPtr.obj" \
- "$(OUTDIR)\xerces-c_2.lib" \
- "$(OUTDIR)\xerces-depdom_2.lib"
-
-"$(OUTDIR)\MemHandlerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("MemHandlerTest.dep")
@@ -387,13 +284,13 @@
!IF "$(CFG)" == "MemHandlerTest - Win32 Release" || "$(CFG)" == "MemHandlerTest - Win32 Debug" || "$(CFG)" == "MemHandlerTest - Win64 Debug" || "$(CFG)" == "MemHandlerTest - Win64 Release"
-SOURCE=..\..\..\..\..\tests\MemHandlerTest\MemoryMonitor.cpp
+SOURCE=..\..\..\..\..\tests\src\MemHandlerTest\MemoryMonitor.cpp
"$(INTDIR)\MemoryMonitor.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\..\..\..\tests\MemHandlerTest\SimpleHashPtr.cpp
+SOURCE=..\..\..\..\..\tests\src\MemHandlerTest\SimpleHashPtr.cpp
"$(INTDIR)\SimpleHashPtr.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -445,56 +342,6 @@
"XercesLib - Win64 ReleaseCLEAN" :
cd "..\XercesLib"
$(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Release" RECURSE=1 CLEAN
- cd "..\MemHandlerTest"
-
-!ENDIF
-
-!IF "$(CFG)" == "MemHandlerTest - Win32 Release"
-
-"XercesDeprecatedDOMLib - Win32 Release" :
- cd "..\XercesLib"
- $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win32 Release"
- cd "..\MemHandlerTest"
-
-"XercesDeprecatedDOMLib - Win32 ReleaseCLEAN" :
- cd "..\XercesLib"
- $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win32 Release" RECURSE=1 CLEAN
- cd "..\MemHandlerTest"
-
-!ELSEIF "$(CFG)" == "MemHandlerTest - Win32 Debug"
-
-"XercesDeprecatedDOMLib - Win32 Debug" :
- cd "..\XercesLib"
- $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win32 Debug"
- cd "..\MemHandlerTest"
-
-"XercesDeprecatedDOMLib - Win32 DebugCLEAN" :
- cd "..\XercesLib"
- $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win32 Debug" RECURSE=1 CLEAN
- cd "..\MemHandlerTest"
-
-!ELSEIF "$(CFG)" == "MemHandlerTest - Win64 Debug"
-
-"XercesDeprecatedDOMLib - Win64 Debug" :
- cd "..\XercesLib"
- $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win64 Debug"
- cd "..\MemHandlerTest"
-
-"XercesDeprecatedDOMLib - Win64 DebugCLEAN" :
- cd "..\XercesLib"
- $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win64 Debug" RECURSE=1 CLEAN
- cd "..\MemHandlerTest"
-
-!ELSEIF "$(CFG)" == "MemHandlerTest - Win64 Release"
-
-"XercesDeprecatedDOMLib - Win64 Release" :
- cd "..\XercesLib"
- $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win64 Release"
- cd "..\MemHandlerTest"
-
-"XercesDeprecatedDOMLib - Win64 ReleaseCLEAN" :
- cd "..\XercesLib"
- $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesDeprecatedDOMLib.mak" CFG="XercesDeprecatedDOMLib - Win64 Release" RECURSE=1 CLEAN
cd "..\MemHandlerTest"
!ENDIF
Modified: xerces/c/trunk/Projects/Win32/VC6/xerces-all/MemParse/MemParse.mak
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC6/xerces-all/MemParse/MemParse.mak?view=diff&rev=513666&r1=513665&r2=513666
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/MemParse/MemParse.mak (original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/MemParse/MemParse.mak Fri Mar 2 01:02:50 2007
@@ -27,6 +27,9 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "MemParse - Win32 Release"
OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -62,50 +65,17 @@
"$(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)\MemParse.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)\MemParse.pdb" /machine:I386 /out:"$(OUTDIR)\MemParse.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)\MemParse.pdb" /machine:I386 /out:"$(OUTDIR)\MemParse.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
LINK32_OBJS= \
"$(INTDIR)\MemParse.obj" \
"$(INTDIR)\MemParseHandlers.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
+ "$(OUTDIR)\xerces-c_3.lib"
"$(OUTDIR)\MemParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -149,50 +119,17 @@
"$(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)\MemParse.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)\MemParse.pdb" /debug /machine:I386 /out:"$(OUTDIR)\MemParse.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)\MemParse.pdb" /debug /machine:I386 /out:"$(OUTDIR)\MemParse.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
LINK32_OBJS= \
"$(INTDIR)\MemParse.obj" \
"$(INTDIR)\MemParseHandlers.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\MemParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -236,50 +173,17 @@
"$(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)\MemParse.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)\MemParse.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\MemParse.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)\MemParse.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\MemParse.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
LINK32_OBJS= \
"$(INTDIR)\MemParse.obj" \
"$(INTDIR)\MemParseHandlers.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\MemParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -321,8 +225,24 @@
"$(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)\MemParse.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)\MemParse.pdb" /machine:IX86 /out:"$(OUTDIR)\MemParse.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+LINK32_OBJS= \
+ "$(INTDIR)\MemParse.obj" \
+ "$(INTDIR)\MemParseHandlers.obj" \
+ "$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\MemParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -354,25 +274,6 @@
$(CPP_PROJ) $<
<<
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\MemParse.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)\MemParse.pdb" /machine:IX86 /out:"$(OUTDIR)\MemParse.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
-LINK32_OBJS= \
- "$(INTDIR)\MemParse.obj" \
- "$(INTDIR)\MemParseHandlers.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\MemParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("MemParse.dep")
@@ -435,13 +336,13 @@
!ENDIF
-SOURCE=..\..\..\..\..\samples\MemParse\MemParse.cpp
+SOURCE=..\..\..\..\..\samples\src\MemParse\MemParse.cpp
"$(INTDIR)\MemParse.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\..\..\..\samples\MemParse\MemParseHandlers.cpp
+SOURCE=..\..\..\..\..\samples\src\MemParse\MemParseHandlers.cpp
"$(INTDIR)\MemParseHandlers.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
Modified: xerces/c/trunk/Projects/Win32/VC6/xerces-all/PParse/PParse.mak
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC6/xerces-all/PParse/PParse.mak?view=diff&rev=513666&r1=513665&r2=513666
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/PParse/PParse.mak (original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/PParse/PParse.mak Fri Mar 2 01:02:50 2007
@@ -27,6 +27,9 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "PParse - Win32 Release"
OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -62,50 +65,17 @@
"$(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)\PParse.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)\PParse.pdb" /machine:I386 /out:"$(OUTDIR)\PParse.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)\PParse.pdb" /machine:I386 /out:"$(OUTDIR)\PParse.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
LINK32_OBJS= \
"$(INTDIR)\PParse.obj" \
"$(INTDIR)\PParseHandlers.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
+ "$(OUTDIR)\xerces-c_3.lib"
"$(OUTDIR)\PParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -149,50 +119,17 @@
"$(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)\PParse.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)\PParse.pdb" /debug /machine:I386 /out:"$(OUTDIR)\PParse.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)\PParse.pdb" /debug /machine:I386 /out:"$(OUTDIR)\PParse.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
LINK32_OBJS= \
"$(INTDIR)\PParse.obj" \
"$(INTDIR)\PParseHandlers.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\PParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -236,50 +173,17 @@
"$(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)\PParse.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)\PParse.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\PParse.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)\PParse.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\PParse.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
LINK32_OBJS= \
"$(INTDIR)\PParse.obj" \
"$(INTDIR)\PParseHandlers.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\PParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -321,8 +225,24 @@
"$(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)\PParse.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)\PParse.pdb" /machine:IX86 /out:"$(OUTDIR)\PParse.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+LINK32_OBJS= \
+ "$(INTDIR)\PParse.obj" \
+ "$(INTDIR)\PParseHandlers.obj" \
+ "$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\PParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -354,25 +274,6 @@
$(CPP_PROJ) $<
<<
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\PParse.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)\PParse.pdb" /machine:IX86 /out:"$(OUTDIR)\PParse.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
-LINK32_OBJS= \
- "$(INTDIR)\PParse.obj" \
- "$(INTDIR)\PParseHandlers.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\PParse.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("PParse.dep")
@@ -384,13 +285,13 @@
!IF "$(CFG)" == "PParse - Win32 Release" || "$(CFG)" == "PParse - Win32 Debug" || "$(CFG)" == "PParse - Win64 Debug" || "$(CFG)" == "PParse - Win64 Release"
-SOURCE=..\..\..\..\..\samples\PParse\PParse.cpp
+SOURCE=..\..\..\..\..\samples\src\PParse\PParse.cpp
"$(INTDIR)\PParse.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\..\..\..\samples\PParse\PParseHandlers.cpp
+SOURCE=..\..\..\..\..\samples\src\PParse\PParseHandlers.cpp
"$(INTDIR)\PParseHandlers.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
Modified: xerces/c/trunk/Projects/Win32/VC6/xerces-all/PSVIWriter/PSVIWriter.mak
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC6/xerces-all/PSVIWriter/PSVIWriter.mak?view=diff&rev=513666&r1=513665&r2=513666
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/PSVIWriter/PSVIWriter.mak (original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/PSVIWriter/PSVIWriter.mak Fri Mar 2 01:02:50 2007
@@ -27,7 +27,8 @@
NULL=nul
!ENDIF
-CPP=$(CPP)
+CPP=cl.exe
+RSC=rc.exe
!IF "$(CFG)" == "PSVIWriter - Win32 Release"
@@ -52,7 +53,6 @@
!ELSE
CLEAN :
!ENDIF
- -@erase "$(INTDIR)\PSVIUni.obj"
-@erase "$(INTDIR)\PSVIWriter.obj"
-@erase "$(INTDIR)\PSVIWriterHandlers.obj"
-@erase "$(INTDIR)\vc60.idb"
@@ -65,18 +65,17 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-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
+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)\PSVIWriter.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PSVIWriter.pdb" /machine:I386 /out:"$(OUTDIR)\PSVIWriter.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PSVIWriter.pdb" /machine:I386 /out:"$(OUTDIR)\PSVIWriter.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
LINK32_OBJS= \
- "$(INTDIR)\PSVIUni.obj" \
"$(INTDIR)\PSVIWriter.obj" \
"$(INTDIR)\PSVIWriterHandlers.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
+ "$(OUTDIR)\xerces-c_3.lib"
"$(OUTDIR)\PSVIWriter.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -106,7 +105,6 @@
!ELSE
CLEAN :
!ENDIF
- -@erase "$(INTDIR)\PSVIUni.obj"
-@erase "$(INTDIR)\PSVIWriter.obj"
-@erase "$(INTDIR)\PSVIWriterHandlers.obj"
-@erase "$(INTDIR)\vc60.idb"
@@ -121,18 +119,17 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_CONSOLE" /D "PLATFORM_WIN32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+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)\PSVIWriter.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PSVIWriter.pdb" /debug /machine:I386 /out:"$(OUTDIR)\PSVIWriter.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PSVIWriter.pdb" /debug /machine:I386 /out:"$(OUTDIR)\PSVIWriter.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
LINK32_OBJS= \
- "$(INTDIR)\PSVIUni.obj" \
"$(INTDIR)\PSVIWriter.obj" \
"$(INTDIR)\PSVIWriterHandlers.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\PSVIWriter.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -162,7 +159,6 @@
!ELSE
CLEAN :
!ENDIF
- -@erase "$(INTDIR)\PSVIUni.obj"
-@erase "$(INTDIR)\PSVIWriter.obj"
-@erase "$(INTDIR)\PSVIWriterHandlers.obj"
-@erase "$(INTDIR)\vc60.idb"
@@ -177,18 +173,17 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-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
+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)\PSVIWriter.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PSVIWriter.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\PSVIWriter.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)\PSVIWriter.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\PSVIWriter.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
LINK32_OBJS= \
- "$(INTDIR)\PSVIUni.obj" \
"$(INTDIR)\PSVIWriter.obj" \
"$(INTDIR)\PSVIWriterHandlers.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\PSVIWriter.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -205,11 +200,11 @@
!IF "$(RECURSE)" == "0"
-ALL : "$(OUTDIR)\PSVIWriter.exe"
+ALL : "$(OUTDIR)\PSVIWriter.exe" "$(OUTDIR)\PSVIWriter.bsc"
!ELSE
-ALL : "XercesLib - Win64 Release" "$(OUTDIR)\PSVIWriter.exe"
+ALL : "XercesLib - Win64 Release" "$(OUTDIR)\PSVIWriter.exe" "$(OUTDIR)\PSVIWriter.bsc"
!ENDIF
@@ -218,10 +213,12 @@
!ELSE
CLEAN :
!ENDIF
- -@erase "$(INTDIR)\PSVIUni.obj"
-@erase "$(INTDIR)\PSVIWriter.obj"
+ -@erase "$(INTDIR)\PSVIWriter.sbr"
-@erase "$(INTDIR)\PSVIWriterHandlers.obj"
+ -@erase "$(INTDIR)\PSVIWriterHandlers.sbr"
-@erase "$(INTDIR)\vc60.idb"
+ -@erase "$(OUTDIR)\PSVIWriter.bsc"
-@erase "$(OUTDIR)\PSVIWriter.exe"
-@erase "$(OUTDIR)\PSVIWriter.ilk"
@@ -231,18 +228,24 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-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" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
BSC32=bscmake.exe
BSC32_FLAGS=/o"$(OUTDIR)\PSVIWriter.bsc"
BSC32_SBRS= \
-
+ "$(INTDIR)\PSVIWriter.sbr" \
+ "$(INTDIR)\PSVIWriterHandlers.sbr"
+
+"$(OUTDIR)\PSVIWriter.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+ $(BSC32) @<<
+ $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PSVIWriter.pdb" /machine:IX86 /out:"$(OUTDIR)\PSVIWriter.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3.lib /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\PSVIWriter.pdb" /machine:IX86 /out:"$(OUTDIR)\PSVIWriter.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
LINK32_OBJS= \
- "$(INTDIR)\PSVIUni.obj" \
"$(INTDIR)\PSVIWriter.obj" \
"$(INTDIR)\PSVIWriterHandlers.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
+ "$(OUTDIR)\xerces-c_3.lib"
"$(OUTDIR)\PSVIWriter.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -343,23 +346,69 @@
!ENDIF
-SOURCE=..\..\..\..\..\samples\PSVIWriter\PSVIUni.cpp
+SOURCE=..\..\..\..\..\samples\src\PSVIWriter\PSVIWriter.cpp
+
+!IF "$(CFG)" == "PSVIWriter - Win32 Release"
+
+
+"$(INTDIR)\PSVIWriter.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "PSVIWriter - Win32 Debug"
+
-"$(INTDIR)\PSVIUni.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\PSVIWriter.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\..\..\..\samples\PSVIWriter\PSVIWriter.cpp
+!ELSEIF "$(CFG)" == "PSVIWriter - Win64 Debug"
+
"$(INTDIR)\PSVIWriter.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\..\..\..\samples\PSVIWriter\PSVIWriterHandlers.cpp
+!ELSEIF "$(CFG)" == "PSVIWriter - Win64 Release"
+
+
+"$(INTDIR)\PSVIWriter.obj" "$(INTDIR)\PSVIWriter.sbr" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
+SOURCE=..\..\..\..\..\samples\src\PSVIWriter\PSVIWriterHandlers.cpp
+
+!IF "$(CFG)" == "PSVIWriter - Win32 Release"
+
"$(INTDIR)\PSVIWriterHandlers.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
+
+!ELSEIF "$(CFG)" == "PSVIWriter - Win32 Debug"
+
+
+"$(INTDIR)\PSVIWriterHandlers.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "PSVIWriter - Win64 Debug"
+
+
+"$(INTDIR)\PSVIWriterHandlers.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "PSVIWriter - Win64 Release"
+
+
+"$(INTDIR)\PSVIWriterHandlers.obj" "$(INTDIR)\PSVIWriterHandlers.sbr" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
!ENDIF
Modified: xerces/c/trunk/Projects/Win32/VC6/xerces-all/RangeTest/RangeTest.mak
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC6/xerces-all/RangeTest/RangeTest.mak?view=diff&rev=513666&r1=513665&r2=513666
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/RangeTest/RangeTest.mak (original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/RangeTest/RangeTest.mak Fri Mar 2 01:02:50 2007
@@ -27,6 +27,9 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "RangeTest - 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)\RangeTest.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)\RangeTest.pdb" /machine:I386 /out:"$(OUTDIR)\RangeTest.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)\RangeTest.pdb" /machine:I386 /out:"$(OUTDIR)\RangeTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
LINK32_OBJS= \
"$(INTDIR)\RangeTest.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
+ "$(OUTDIR)\xerces-c_3.lib"
"$(OUTDIR)\RangeTest.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=/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)\RangeTest.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)\RangeTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\RangeTest.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)\RangeTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\RangeTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
LINK32_OBJS= \
"$(INTDIR)\RangeTest.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\RangeTest.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)\RangeTest.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)\RangeTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\RangeTest.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)\RangeTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\RangeTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
LINK32_OBJS= \
"$(INTDIR)\RangeTest.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\RangeTest.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)\RangeTest.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)\RangeTest.pdb" /machine:IX86 /out:"$(OUTDIR)\RangeTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+LINK32_OBJS= \
+ "$(INTDIR)\RangeTest.obj" \
+ "$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\RangeTest.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)\RangeTest.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)\RangeTest.pdb" /machine:IX86 /out:"$(OUTDIR)\RangeTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
-LINK32_OBJS= \
- "$(INTDIR)\RangeTest.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\RangeTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("RangeTest.dep")
@@ -427,7 +328,7 @@
!ENDIF
-SOURCE=..\..\..\..\..\tests\Dom\RangeTest\RangeTest.cpp
+SOURCE=..\..\..\..\..\tests\src\DOM\RangeTest\RangeTest.cpp
"$(INTDIR)\RangeTest.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
Modified: xerces/c/trunk/Projects/Win32/VC6/xerces-all/Redirect/Redirect.mak
URL: http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC6/xerces-all/Redirect/Redirect.mak?view=diff&rev=513666&r1=513665&r2=513666
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/Redirect/Redirect.mak (original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/Redirect/Redirect.mak Fri Mar 2 01:02:50 2007
@@ -27,6 +27,9 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "Redirect - Win32 Release"
OUTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release
@@ -62,50 +65,17 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /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 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
BSC32=bscmake.exe
BSC32_FLAGS=/o"$(OUTDIR)\Redirect.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)\Redirect.pdb" /machine:I386 /out:"$(OUTDIR)\Redirect.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)\Redirect.pdb" /machine:I386 /out:"$(OUTDIR)\Redirect.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
LINK32_OBJS= \
"$(INTDIR)\Redirect.obj" \
"$(INTDIR)\RedirectHandlers.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
+ "$(OUTDIR)\xerces-c_3.lib"
"$(OUTDIR)\Redirect.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -149,50 +119,17 @@
"$(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)\Redirect.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)\Redirect.pdb" /debug /machine:I386 /out:"$(OUTDIR)\Redirect.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)\Redirect.pdb" /debug /machine:I386 /out:"$(OUTDIR)\Redirect.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
LINK32_OBJS= \
"$(INTDIR)\Redirect.obj" \
"$(INTDIR)\RedirectHandlers.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\Redirect.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -236,50 +173,17 @@
"$(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)\Redirect.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)\Redirect.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\Redirect.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)\Redirect.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\Redirect.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
LINK32_OBJS= \
"$(INTDIR)\Redirect.obj" \
"$(INTDIR)\RedirectHandlers.obj" \
- "$(OUTDIR)\xerces-c_2D.lib"
+ "$(OUTDIR)\xerces-c_3D.lib"
"$(OUTDIR)\Redirect.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -321,8 +225,24 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /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 /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)\Redirect.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)\Redirect.pdb" /machine:IX86 /out:"$(OUTDIR)\Redirect.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+LINK32_OBJS= \
+ "$(INTDIR)\Redirect.obj" \
+ "$(INTDIR)\RedirectHandlers.obj" \
+ "$(OUTDIR)\xerces-c_3.lib"
+
+"$(OUTDIR)\Redirect.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -354,25 +274,6 @@
$(CPP_PROJ) $<
<<
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\Redirect.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)\Redirect.pdb" /machine:IX86 /out:"$(OUTDIR)\Redirect.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
-LINK32_OBJS= \
- "$(INTDIR)\Redirect.obj" \
- "$(INTDIR)\RedirectHandlers.obj" \
- "$(OUTDIR)\xerces-c_2.lib"
-
-"$(OUTDIR)\Redirect.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("Redirect.dep")
@@ -435,13 +336,13 @@
!ENDIF
-SOURCE=..\..\..\..\..\samples\Redirect\Redirect.cpp
+SOURCE=..\..\..\..\..\samples\src\Redirect\Redirect.cpp
"$(INTDIR)\Redirect.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\..\..\..\samples\Redirect\RedirectHandlers.cpp
+SOURCE=..\..\..\..\..\samples\src\Redirect\RedirectHandlers.cpp
"$(INTDIR)\RedirectHandlers.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