mirror of
https://github.com/jezhiggins/arabica
synced 2024-12-26 21:58:39 +01:00
confirm build on VC7 and VC6
This commit is contained in:
parent
4b3a9684aa
commit
8af13de092
10 changed files with 43 additions and 26 deletions
|
@ -22,7 +22,6 @@ Global
|
|||
EndGlobalSection
|
||||
GlobalSection(ProjectDependencies) = postSolution
|
||||
{E5157BA4-96A1-4D7F-B895-8C9A32F26BB5}.0 = {884490E3-E4B3-43BE-A88B-7FA9EA4E16AB}
|
||||
{E5157BA4-96A1-4D7F-B895-8C9A32F26BB5}.1 = {AFD0FD18-3D55-4CEC-A242-EA290EBBF171}
|
||||
{884490E3-E4B3-43BE-A88B-7FA9EA4E16AB}.0 = {BC91F529-08ED-4263-BC28-BFF008E27F36}
|
||||
{16475ED0-2906-429B-9E73-F2BF2929F6E9}.0 = {BC91F529-08ED-4263-BC28-BFF008E27F36}
|
||||
{16475ED0-2906-429B-9E73-F2BF2929F6E9}.1 = {884490E3-E4B3-43BE-A88B-7FA9EA4E16AB}
|
||||
|
|
|
@ -43,7 +43,7 @@ CXXFLAGS += -O2
|
|||
LDFLAGS += -O2
|
||||
|
||||
# edit for your parser choice - may include more than one
|
||||
PARSER_CONFIG = -DUSE_EXPAT
|
||||
PARSER_CONFIG = -DUSE_LIBXML2
|
||||
#PARSER_CONFIG = -DUSE_EXPAT -DUSE_LIBXML2 -DUSE_XERCES -DUSE_GARDEN
|
||||
|
||||
# Includes and library directories
|
||||
|
|
|
@ -245,6 +245,12 @@
|
|||
</File>
|
||||
<File
|
||||
RelativePath=".\wrappers\saxexpat.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32"
|
||||
ExcludedFromBuild="TRUE">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
ExcludedFromBuild="TRUE">
|
||||
|
@ -315,8 +321,8 @@
|
|||
Name="Debug|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="cl /TC /D USE_EXPAT /EP ParserConfig.S > ParserConfig.h
|
||||
cl /TC /D USE_EXPAT /EP saxlib.S > saxlib.cpp
|
||||
CommandLine="cl /TC /D USE_MSXML /EP ParserConfig.S > ParserConfig.h
|
||||
cl /TC /D USE_MSXML /EP saxlib.S > saxlib.cpp
|
||||
"
|
||||
Outputs="ParserConfig.h;saxlib.cpp"/>
|
||||
</FileConfiguration>
|
||||
|
@ -324,17 +330,17 @@ cl /TC /D USE_EXPAT /EP saxlib.S > saxlib.cpp
|
|||
Name="Release|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine="cl /TC /D USE_LIBXML2 /EP ParserConfig.S > ParserConfig.h
|
||||
cl /TC /D USE_LIBXML2 /EP saxlib.S > saxlib.cpp
|
||||
CommandLine="cl /TC /D USE_MSXML /EP ParserConfig.S > ParserConfig.h
|
||||
cl /TC /D USE_MSXML /EP saxlib.S > saxlib.cpp
|
||||
"
|
||||
Outputs="ParserConfig.h;saxlib.cpp"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\saxlib.cpp">
|
||||
RelativePath=".\saxlib.S">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\saxlib.S">
|
||||
RelativePath=".\saxlib.cpp">
|
||||
</File>
|
||||
</Files>
|
||||
<Globals>
|
||||
|
|
|
@ -292,8 +292,13 @@ bool basic_Writer<string_type>::isDtd(const string_type& name)
|
|||
name[4] == UnicodeT::RIGHT_SQUARE_BRACKET);
|
||||
} // isDtd
|
||||
|
||||
#if !(defined _MSC_VER) || !(_MSC_VER < 1300)
|
||||
template<class string_type>
|
||||
std::auto_ptr<typename basic_Writer<string_type>::PropertyBase> basic_Writer<string_type>::doGetProperty(const string_type& name)
|
||||
#else
|
||||
template<class string_type>
|
||||
std::auto_ptr<basic_Writer<string_type>::PropertyBase> basic_Writer<string_type>::doGetProperty(const string_type& name)
|
||||
#endif
|
||||
{
|
||||
if(name == properties_.lexicalHandler)
|
||||
{
|
||||
|
@ -305,8 +310,13 @@ std::auto_ptr<typename basic_Writer<string_type>::PropertyBase> basic_Writer<str
|
|||
return XMLFilterT::doGetProperty(name);
|
||||
} // doGetProperty
|
||||
|
||||
#if !(defined _MSC_VER) || !(_MSC_VER < 1300)
|
||||
template<class string_type>
|
||||
void basic_Writer<string_type>::doSetProperty(const string_type& name, std::auto_ptr<typename basic_Writer<string_type>::PropertyBase> value)
|
||||
#else
|
||||
template<class string_type>
|
||||
void basic_Writer<string_type>::doSetProperty(const string_type& name, std::auto_ptr<basic_Writer<string_type>::PropertyBase> value)
|
||||
#endif
|
||||
{
|
||||
if(name == properties_.lexicalHandler)
|
||||
{
|
||||
|
|
13
bin/poem.xml
13
bin/poem.xml
|
@ -1,9 +1,8 @@
|
|||
<?xml version="1.0"?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<poem>
|
||||
<line>Roses are red,</line>
|
||||
<line>Violets are blue.</line>
|
||||
<line>Sugar is sweet,</line>
|
||||
<line>and I love you.</line>
|
||||
<line><![CDATA[ And I am CDATA ]]></line>
|
||||
<line>Roses are red,</line>
|
||||
<line>Violets are blue.</line>
|
||||
<line>Sugar is õ sweet,</line>
|
||||
<line>and I love you.</line>
|
||||
<line><![CDATA[ And I am CDATA ]]></line>
|
||||
</poem>
|
||||
|
||||
|
|
|
@ -16,4 +16,5 @@
|
|||
<changes>&skipme;
|
||||
</changes>
|
||||
</product>
|
||||
<!-- hey <dude -->
|
||||
</xsa>
|
||||
|
|
|
@ -53,7 +53,7 @@ INCS_DIRS = -I../..
|
|||
LIBS_DIRS =
|
||||
|
||||
STATIC_LIBS =
|
||||
DYNAMIC_LIBS = -L../../bin -lSAX -lexpat
|
||||
DYNAMIC_LIBS = -L../../bin -lSAX -lxml2
|
||||
|
||||
CXXFLAGS += ${INCS_DIRS}
|
||||
LDFLAGS += ${DYNAMIC_LIBS}
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="5"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
UsePrecompiledHeader="2"
|
||||
UsePrecompiledHeader="0"
|
||||
PrecompiledHeaderFile=".\pyx___Win32_Debug/pyx.pch"
|
||||
AssemblerListingLocation=".\pyx___Win32_Debug/"
|
||||
ObjectFile=".\pyx___Win32_Debug/"
|
||||
|
@ -40,11 +40,11 @@
|
|||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/MACHINE:I386"
|
||||
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib"
|
||||
AdditionalDependencies="wsock32.lib"
|
||||
OutputFile=".\..\..\bin/pyx.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="..\..\lib,\work\lib\vc6"
|
||||
AdditionalLibraryDirectories="..\..\lib"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile=".\..\..\bin/pyx.pdb"
|
||||
SubSystem="1"/>
|
||||
|
@ -68,7 +68,7 @@
|
|||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory=".\..\bin"
|
||||
OutputDirectory=".\..\..\bin"
|
||||
IntermediateDirectory=".\Release"
|
||||
ConfigurationType="1"
|
||||
UseOfMFC="0"
|
||||
|
@ -77,13 +77,13 @@
|
|||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\SAXExpat,..\SAXlibxml,..\SAX,..\"
|
||||
AdditionalIncludeDirectories="..\..\"
|
||||
PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="4"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
UsePrecompiledHeader="2"
|
||||
UsePrecompiledHeader="0"
|
||||
PrecompiledHeaderFile=".\Release/pyx.pch"
|
||||
AssemblerListingLocation=".\Release/"
|
||||
ObjectFile=".\Release/"
|
||||
|
@ -96,7 +96,7 @@
|
|||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/MACHINE:I386"
|
||||
AdditionalDependencies="odbc32.lib odbccp32.lib"
|
||||
AdditionalDependencies="wsock32.lib"
|
||||
OutputFile=".\..\bin/pyx.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
|
|
|
@ -53,7 +53,7 @@ INCS_DIRS = -I../..
|
|||
LIBS_DIRS =
|
||||
|
||||
STATIC_LIBS =
|
||||
DYNAMIC_LIBS = -L../../bin -lSAX -lexpat
|
||||
DYNAMIC_LIBS = -L../../bin -lSAX -lxml
|
||||
|
||||
CXXFLAGS += ${INCS_DIRS}
|
||||
LDFLAGS += ${DYNAMIC_LIBS}
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/MACHINE:I386"
|
||||
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib"
|
||||
AdditionalDependencies="wsock32.lib"
|
||||
OutputFile=".\..\..\bin/SAX2DOM_test.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
|
@ -77,10 +77,12 @@
|
|||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\"
|
||||
PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="4"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
UsePrecompiledHeader="2"
|
||||
PrecompiledHeaderFile=".\Release/SAX2DOM_test.pch"
|
||||
AssemblerListingLocation=".\Release/"
|
||||
|
@ -93,7 +95,7 @@
|
|||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/MACHINE:I386"
|
||||
AdditionalDependencies="odbc32.lib odbccp32.lib"
|
||||
AdditionalDependencies="wsock32.lib"
|
||||
OutputFile=".\Release/SAX2DOM_test.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
|
|
Loading…
Reference in a new issue