Miroirs/arabica
1
0
Fork 0
mirror of https://github.com/jezhiggins/arabica synced 2024-12-26 21:58:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated for libexpat 1.95.4

Browse source
This commit is contained in:
jez_higgins 2002-09-03 13:44:23 +00:00
parent d1449f7b44
commit 62b73b7b75
9 changed files with 65 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SAX/ParserConfig.tpl
View file

@ -50,7 +50,7 @@ include <SAX/wrappers/saxexpat.h>
undef DEF_SAX_P
define DEF_SAX_P expat_wrapper
#ifdef _MSC_VER
comment(lib, "expat.lib")
comment(lib, "libexpat.lib")
#endif
#endif

6
SAX/SAX.dsp
View file

@ -64,7 +64,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\\" /I "\work\include" /I "\work\lib" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_XERCES" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe
@ -328,8 +328,8 @@ SOURCE=.\ParserConfig.tpl
InputPath=.\ParserConfig.tpl
BuildCmds= \
cl /TC /D USE_MSXML /EP ParserConfig.tpl > ParserConfig.h \
cl /TC /D USE_MSXML /EP saxlib.tpl > saxlib.cpp \
cl /TC /D USE_EXPAT /EP ParserConfig.tpl > ParserConfig.h \
cl /TC /D USE_EXPAT /EP saxlib.tpl > saxlib.cpp \
"ParserConfig.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

2
examples/SAX/SimpleHandler.dsp
View file

@ -65,7 +65,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /I "\work\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe

2
examples/SAX/SimpleHandler.mak
View file

@ -120,7 +120,7 @@ CLEAN :
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
CPP_PROJ=/nologo /MLd /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /I "\work\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\SimpleHandler.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
CPP_PROJ=/nologo /MLd /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\SimpleHandler.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\SimpleHandler.bsc"
BSC32_SBRS= \

2
examples/SAX/Writer.dsp
View file

@ -65,7 +65,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /I "\work\include" /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe

3
examples/SAX/pyx.dsp
View file

@ -65,8 +65,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /I "\work\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_MSXML" /YX /FD /GZ /c
# SUBTRACT CPP /Fr
# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe

59
examples/SAX/pyx.mak
View file

@ -36,10 +36,21 @@ INTDIR=.\Release
OutDir=.\..\bin
# End Custom Macros
!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\pyx.exe"
!ELSE
ALL : "SAXlib - Win32 Release" "$(OUTDIR)\pyx.exe"
!ENDIF
!IF "$(RECURSE)" == "1"
CLEAN :"SAXlib - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
-@erase "$(INTDIR)\pyx.obj"
-@erase "$(INTDIR)\vc60.idb"
-@erase "$(OUTDIR)\pyx.exe"
@ -60,8 +71,7 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi3
LINK32_OBJS= \
"$(INTDIR)\pyx.obj" \
"..\..\lib\SAX.lib" \
"..\..\..\..\lib\vc6\expat.lib" \
"..\..\lib\Utilities.lib"
"..\..\SAX\Release\SAX.lib"
"$(OUTDIR)\pyx.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@ -76,10 +86,21 @@ INTDIR=.\pyx___Win32_Debug
OutDir=.\..\..\bin
# End Custom Macros
!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\pyx.exe"
!ELSE
ALL : "SAXlib - Win32 Debug" "$(OUTDIR)\pyx.exe"
!ENDIF
!IF "$(RECURSE)" == "1"
CLEAN :"SAXlib - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
-@erase "$(INTDIR)\pyx.obj"
-@erase "$(INTDIR)\vc60.idb"
-@erase "$(INTDIR)\vc60.pdb"
@ -93,18 +114,16 @@ CLEAN :
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
CPP_PROJ=/nologo /MLd /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /I "\work\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\pyx.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
CPP_PROJ=/nologo /MLd /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\pyx.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\pyx.bsc"
BSC32_SBRS= \
LINK32=link.exe
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pyx.pdb" /debug /machine:I386 /out:"$(OUTDIR)\pyx.exe" /pdbtype:sept
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pyx.pdb" /debug /machine:I386 /out:"$(OUTDIR)\pyx.exe" /pdbtype:sept /libpath:"..\..\lib" /libpath:"\work\lib\vc6"
LINK32_OBJS= \
"$(INTDIR)\pyx.obj" \
"..\..\lib\SAX.lib" \
"..\..\..\..\lib\vc6\expat.lib" \
"..\..\lib\Utilities.lib"
"..\..\lib\SAX.lib"
"$(OUTDIR)\pyx.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@ -159,6 +178,32 @@ SOURCE=.\pyx.cpp
"$(INTDIR)\pyx.obj" : $(SOURCE) "$(INTDIR)"
!IF "$(CFG)" == "pyx - Win32 Release"
"SAXlib - Win32 Release" :
cd "\work\JezUK\Arabica\src\SAX"
$(MAKE) /$(MAKEFLAGS) /F .\SAX.mak CFG="SAXlib - Win32 Release"
cd "..\examples\SAX"
"SAXlib - Win32 ReleaseCLEAN" :
cd "\work\JezUK\Arabica\src\SAX"
$(MAKE) /$(MAKEFLAGS) /F .\SAX.mak CFG="SAXlib - Win32 Release" RECURSE=1 CLEAN
cd "..\examples\SAX"
!ELSEIF "$(CFG)" == "pyx - Win32 Debug"
"SAXlib - Win32 Debug" :
cd "\work\JezUK\Arabica\src\SAX"
$(MAKE) /$(MAKEFLAGS) /F .\SAX.mak CFG="SAXlib - Win32 Debug"
cd "..\examples\SAX"
"SAXlib - Win32 DebugCLEAN" :
cd "\work\JezUK\Arabica\src\SAX"
$(MAKE) /$(MAKEFLAGS) /F .\SAX.mak CFG="SAXlib - Win32 Debug" RECURSE=1 CLEAN
cd "..\examples\SAX"
!ENDIF
!ENDIF

2
examples/SAX2DOM/SAX2DOM_test.dsp
View file

@ -65,7 +65,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /I "\work\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_EXPAT" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe

8
examples/SAX2DOM/SAX2DOM_test.mak
View file

@ -88,6 +88,7 @@ LINK32_OBJS= \
"$(INTDIR)\test_DOMImplementation.obj" \
"$(INTDIR)\test_Element.obj" \
"$(INTDIR)\test_ProcessingInstruction.obj" \
"$(INTDIR)\test_SAX.obj" \
"$(INTDIR)\test_Siblings.obj" \
"$(INTDIR)\TestCase.obj" \
"$(INTDIR)\TestFailure.obj" \
@ -96,7 +97,6 @@ LINK32_OBJS= \
"$(INTDIR)\TextTestResult.obj" \
"..\..\lib\SAX.lib" \
"..\..\lib\Utilities.lib" \
"$(INTDIR)\test_SAX.obj" \
"..\..\SAX\Release\SAX.lib"
"$(OUTDIR)\SAX2DOM_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@ -154,7 +154,7 @@ CLEAN :
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
CPP_PROJ=/nologo /MLd /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /I "\work\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_EXPAT" /Fp"$(INTDIR)\SAX2DOM_test.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
CPP_PROJ=/nologo /MLd /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\SAX2DOM_test.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\SAX2DOM_test.bsc"
BSC32_SBRS= \
@ -170,6 +170,7 @@ LINK32_OBJS= \
"$(INTDIR)\test_DOMImplementation.obj" \
"$(INTDIR)\test_Element.obj" \
"$(INTDIR)\test_ProcessingInstruction.obj" \
"$(INTDIR)\test_SAX.obj" \
"$(INTDIR)\test_Siblings.obj" \
"$(INTDIR)\TestCase.obj" \
"$(INTDIR)\TestFailure.obj" \
@ -177,8 +178,7 @@ LINK32_OBJS= \
"$(INTDIR)\TestSuite.obj" \
"$(INTDIR)\TextTestResult.obj" \
"..\..\lib\SAX.lib" \
"..\..\lib\Utilities.lib" \
"$(INTDIR)\test_SAX.obj"
"..\..\lib\Utilities.lib"
"$(OUTDIR)\SAX2DOM_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<