[Libreoffice-commits] libmspub.git: 3 commits - build/win32 configure.ac src/lib

David Tardon dtardon at redhat.com
Sat Oct 28 13:34:29 UTC 2017


 build/win32/Makefile.am          |   15 -
 build/win32/libmspub.dsp         |  302 ------------------------------
 build/win32/libmspub.dsw         |   57 -----
 build/win32/libmspub.vcproj      |  392 ---------------------------------------
 build/win32/libmspub.vcproj.sln  |   37 ---
 build/win32/libmspub.vcxproj     |  163 ----------------
 build/win32/libmspub.vcxproj.sln |   31 ---
 build/win32/pub2raw.dsp          |  102 ----------
 build/win32/pub2raw.vcproj       |  231 ----------------------
 build/win32/pub2raw.vcxproj      |  147 --------------
 build/win32/pub2xhtml.dsp        |  102 ----------
 build/win32/pub2xhtml.vcproj     |  231 ----------------------
 build/win32/pub2xhtml.vcxproj    |  147 --------------
 configure.ac                     |    7 
 src/lib/MSPUBCollector.h         |    2 
 15 files changed, 2 insertions(+), 1964 deletions(-)

New commits:
commit 52dc03be45f8724d654029bdd2f0269fbb8d29d5
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Oct 28 15:34:02 2017 +0200

    drop outdated MSVC project files
    
    Change-Id: I88b977eb42e30dee330cfe07a6eff03f84d79913

diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index 83a97b2..92cdead 100644
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -1,18 +1,3 @@
 EXTRA_DIST = \
-	libmspub.dsw \
-	libmspub.dsp \
-	pub2raw.dsp \
-	pub2xhtml.dsp \
-	\
-	libmspub.vcproj.sln \
-	libmspub.vcproj \
-	pub2raw.vcproj \
-	pub2xhtml.vcproj \
-	\
-	libmspub.vcxproj.sln \
-	libmspub.vcxproj \
-	pub2raw.vcxproj \
-	pub2xhtml.vcxproj \
-	\
 	compile-resource \
 	lt-compile-resource
diff --git a/build/win32/libmspub.dsp b/build/win32/libmspub.dsp
deleted file mode 100644
index e50e13e..0000000
--- a/build/win32/libmspub.dsp
+++ /dev/null
@@ -1,302 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libmspub" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libmspub - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libmspub.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libmspub.mak" CFG="libmspub - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libmspub - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libmspub - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libmspub - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Release\lib\libmspub-0.0.lib"
-
-!ELSEIF  "$(CFG)" == "libmspub - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /GR /GX /ZI /Od /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Debug\lib\libmspub-0.0.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libmspub - Win32 Release"
-# Name "libmspub - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\src\lib\ColorReference.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\Dash.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\Fill.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\libmspub_utils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\MSPUBCollector.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\MSPUBDocument.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\MSPUBParser.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\MSPUBParser2k.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\MSPUBParser97.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\MSPUBSVGGenerator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\PolygonUtils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\Shadow.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\ShapeGroupElement.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\VectorTransformation2D.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\inc\libmspub\libmspub.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\inc\libmspub\MSPUBDocument.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\Arrow.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\BorderArtInfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\ColorReference.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\Coordinate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\Dash.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\EmbeddedFontInfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\EscherContainerType.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\EscherFieldIds.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\Fill.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\FillType.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\libmspub_utils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\Line.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\ListInfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\Margins.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\MSPUBBlockID.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\MSPUBBlockType.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\MSPUBCollector.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\MSPUBConstants.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\MSPUBContentChunkType.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\MSPUBParser.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\MSPUBParser2k.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\MSPUBParser97.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\MSPUBSVGGenerator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\MSPUBTypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\NumberingDelimiter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\NumberingType.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\PolygonUtils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\Shadow.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\ShapeFlags.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\ShapeGroupElement.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\ShapeInfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\Shapes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\ShapeType.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\TableInfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\VectorTransformation2D.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lib\VerticalAlign.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/build/win32/libmspub.dsw b/build/win32/libmspub.dsw
deleted file mode 100644
index 0ffd84e..0000000
--- a/build/win32/libmspub.dsw
+++ /dev/null
@@ -1,57 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "libmspub"=.\libmspub.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "pub2xhtml"=.\pub2xhtml.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libmspub
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "pub2raw"=.\pub2raw.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libmspub
-    End Project Dependency
-}}}
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/build/win32/libmspub.vcproj b/build/win32/libmspub.vcproj
deleted file mode 100644
index aa8f955..0000000
--- a/build/win32/libmspub.vcproj
+++ /dev/null
@@ -1,392 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="libmspub"
-	ProjectGUID="{775F637A-97DE-4701-A690-E0F1B14A80D9}"
-	RootNamespace="libmspub"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
-				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				TreatWChar_tAsBuiltInType="false"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\Release/libmspub.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="Release\lib\libmspub-0.0.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/libmspub.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
-				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="false"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\Debug/libmspub.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="Debug\lib\libmspub-0.0.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/libmspub.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\src\lib\ColorReference.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\Dash.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\Fill.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\libmspub_utils.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\MSPUBCollector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\MSPUBDocument.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\MSPUBParser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\MSPUBParser2k.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\MSPUBParser97.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\MSPUBSVGGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\PolygonUtils.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\Shadow.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\ShapeGroupElement.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\VectorTransformation2D.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\..\inc\libmspub\libmspub.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\inc\libmspub\MSPUBDocument.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\Arrow.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\BorderArtInfo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\ColorReference.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\Coordinate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\Dash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\EmbeddedFontInfo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\EscherContainerType.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\EscherFieldIds.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\Fill.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\FillType.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\libmspub_utils.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\Line.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\ListInfo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\Margins.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\MSPUBBlockID.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\MSPUBBlockType.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\MSPUBCollector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\MSPUBConstants.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\MSPUBContentChunkType.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\MSPUBParser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\MSPUBParser2k.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\MSPUBParser97.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\MSPUBSVGGenerator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\MSPUBTypes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\NumberingDelimiter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\NumberingType.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\PolygonUtils.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\Shadow.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\ShapeFlags.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\ShapeGroupElement.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\ShapeInfo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\Shapes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\ShapeType.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\TableInfo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\VectorTransformation2D.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\VerticalAlign.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/libmspub.vcproj.sln b/build/win32/libmspub.vcproj.sln
deleted file mode 100644
index 671b414..0000000
--- a/build/win32/libmspub.vcproj.sln
+++ /dev/null
@@ -1,37 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmspub", "libmspub.vcproj", "{775F637A-97DE-4701-A690-E0F1B14A80D9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pub2xhtml", "pub2xhtml.vcproj", "{4ACAB1F6-15FB-45BE-B377-4DD3886CFB3A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{775F637A-97DE-4701-A690-E0F1B14A80D9} = {775F637A-97DE-4701-A690-E0F1B14A80D9}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pub2raw", "pub2raw.vcproj", "{8F263821-9D45-4653-AC9F-0A306B82F3BB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{775F637A-97DE-4701-A690-E0F1B14A80D9} = {775F637A-97DE-4701-A690-E0F1B14A80D9}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{775F637A-97DE-4701-A690-E0F1B14A80D9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{775F637A-97DE-4701-A690-E0F1B14A80D9}.Debug|Win32.Build.0 = Debug|Win32
-		{775F637A-97DE-4701-A690-E0F1B14A80D9}.Release|Win32.ActiveCfg = Release|Win32
-		{775F637A-97DE-4701-A690-E0F1B14A80D9}.Release|Win32.Build.0 = Release|Win32
-		{4ACAB1F6-15FB-45BE-B377-4DD3886CFB3A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4ACAB1F6-15FB-45BE-B377-4DD3886CFB3A}.Debug|Win32.Build.0 = Debug|Win32
-		{4ACAB1F6-15FB-45BE-B377-4DD3886CFB3A}.Release|Win32.ActiveCfg = Release|Win32
-		{4ACAB1F6-15FB-45BE-B377-4DD3886CFB3A}.Release|Win32.Build.0 = Release|Win32
-		{8F263821-9D45-4653-AC9F-0A306B82F3BB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F263821-9D45-4653-AC9F-0A306B82F3BB}.Debug|Win32.Build.0 = Debug|Win32
-		{8F263821-9D45-4653-AC9F-0A306B82F3BB}.Release|Win32.ActiveCfg = Release|Win32
-		{8F263821-9D45-4653-AC9F-0A306B82F3BB}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/build/win32/libmspub.vcxproj b/build/win32/libmspub.vcxproj
deleted file mode 100644
index 3849b77..0000000
--- a/build/win32/libmspub.vcxproj
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\inc\libmspub\libmspub.h" />
-    <ClInclude Include="..\..\inc\libmspub\MSPUBDocument.h" />
-    <ClInclude Include="..\..\src\lib\Arrow.h" />
-    <ClInclude Include="..\..\src\lib\BorderArtInfo.h" />
-    <ClInclude Include="..\..\src\lib\ColorReference.h" />
-    <ClInclude Include="..\..\src\lib\Coordinate.h" />
-    <ClInclude Include="..\..\src\lib\Dash.h" />
-    <ClInclude Include="..\..\src\lib\EmbeddedFontInfo.h" />
-    <ClInclude Include="..\..\src\lib\EscherContainerType.h" />
-    <ClInclude Include="..\..\src\lib\EscherFieldIds.h" />
-    <ClInclude Include="..\..\src\lib\Fill.h" />
-    <ClInclude Include="..\..\src\lib\FillType.h" />
-    <ClInclude Include="..\..\src\lib\libmspub_utils.h" />
-    <ClInclude Include="..\..\src\lib\Line.h" />
-    <ClInclude Include="..\..\src\lib\ListInfo.h" />
-    <ClInclude Include="..\..\src\lib\Margins.h" />
-    <ClInclude Include="..\..\src\lib\MSPUBBlockID.h" />
-    <ClInclude Include="..\..\src\lib\MSPUBBlockType.h" />
-    <ClInclude Include="..\..\src\lib\MSPUBCollector.h" />
-    <ClInclude Include="..\..\src\lib\MSPUBConstants.h" />
-    <ClInclude Include="..\..\src\lib\MSPUBContentChunkType.h" />
-    <ClInclude Include="..\..\src\lib\MSPUBParser.h" />
-    <ClInclude Include="..\..\src\lib\MSPUBParser2k.h" />
-    <ClInclude Include="..\..\src\lib\MSPUBParser97.h" />
-    <ClInclude Include="..\..\src\lib\MSPUBSVGGenerator.h" />
-    <ClInclude Include="..\..\src\lib\MSPUBTypes.h" />
-    <ClInclude Include="..\..\src\lib\NumberingDelimiter.h" />
-    <ClInclude Include="..\..\src\lib\NumberingType.h" />
-    <ClInclude Include="..\..\src\lib\PolygonUtils.h" />
-    <ClInclude Include="..\..\src\lib\Shadow.h" />
-    <ClInclude Include="..\..\src\lib\ShapeFlags.h" />
-    <ClInclude Include="..\..\src\lib\ShapeGroupElement.h" />
-    <ClInclude Include="..\..\src\lib\ShapeInfo.h" />
-    <ClInclude Include="..\..\src\lib\Shapes.h" />
-    <ClInclude Include="..\..\src\lib\ShapeType.h" />
-    <ClInclude Include="..\..\src\lib\TableInfo.h" />
-    <ClInclude Include="..\..\src\lib\VectorTransformation2D.h" />
-    <ClInclude Include="..\..\src\lib\VerticalAlign.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\lib\ColorReference.cpp" />
-    <ClCompile Include="..\..\src\lib\Dash.cpp" />
-    <ClCompile Include="..\..\src\lib\Fill.cpp" />
-    <ClCompile Include="..\..\src\lib\libmspub_utils.cpp" />
-    <ClCompile Include="..\..\src\lib\MSPUBCollector.cpp" />
-    <ClCompile Include="..\..\src\lib\MSPUBDocument.cpp" />
-    <ClCompile Include="..\..\src\lib\MSPUBParser.cpp" />
-    <ClCompile Include="..\..\src\lib\MSPUBParser2k.cpp" />
-    <ClCompile Include="..\..\src\lib\MSPUBParser97.cpp" />
-    <ClCompile Include="..\..\src\lib\MSPUBSVGGenerator.cpp" />
-    <ClCompile Include="..\..\src\lib\PolygonUtils.cpp" />
-    <ClCompile Include="..\..\src\lib\Shadow.cpp" />
-    <ClCompile Include="..\..\src\lib\ShapeGroupElement.cpp" />
-    <ClCompile Include="..\..\src\lib\VectorTransformation2D.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{775F637A-97DE-4701-A690-E0F1B14A80D9}</ProjectGuid>
-    <RootNamespace>libmspub</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\Release/libmspub.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
-      <ObjectFileName>.\Release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>Release\lib\libmspub-0.0.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release/libmspub.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\Debug/libmspub.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
-      <ObjectFileName>.\Debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>Debug\lib\libmspub-0.0.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Debug/libmspub.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/build/win32/libmspub.vcxproj.sln b/build/win32/libmspub.vcxproj.sln
deleted file mode 100644
index 71cb97a..0000000
--- a/build/win32/libmspub.vcxproj.sln
+++ /dev/null
@@ -1,31 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmspub", "libmspub.vcxproj", "{775F637A-97DE-4701-A690-E0F1B14A80D9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pub2xhtml", "pub2xhtml.vcxproj", "{4ACAB1F6-15FB-45BE-B377-4DD3886CFB3A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pub2raw", "pub2raw.vcxproj", "{8F263821-9D45-4653-AC9F-0A306B82F3BB}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{775F637A-97DE-4701-A690-E0F1B14A80D9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{775F637A-97DE-4701-A690-E0F1B14A80D9}.Debug|Win32.Build.0 = Debug|Win32
-		{775F637A-97DE-4701-A690-E0F1B14A80D9}.Release|Win32.ActiveCfg = Release|Win32
-		{775F637A-97DE-4701-A690-E0F1B14A80D9}.Release|Win32.Build.0 = Release|Win32
-		{4ACAB1F6-15FB-45BE-B377-4DD3886CFB3A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4ACAB1F6-15FB-45BE-B377-4DD3886CFB3A}.Debug|Win32.Build.0 = Debug|Win32
-		{4ACAB1F6-15FB-45BE-B377-4DD3886CFB3A}.Release|Win32.ActiveCfg = Release|Win32
-		{4ACAB1F6-15FB-45BE-B377-4DD3886CFB3A}.Release|Win32.Build.0 = Release|Win32
-		{8F263821-9D45-4653-AC9F-0A306B82F3BB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F263821-9D45-4653-AC9F-0A306B82F3BB}.Debug|Win32.Build.0 = Debug|Win32
-		{8F263821-9D45-4653-AC9F-0A306B82F3BB}.Release|Win32.ActiveCfg = Release|Win32
-		{8F263821-9D45-4653-AC9F-0A306B82F3BB}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/build/win32/pub2raw.dsp b/build/win32/pub2raw.dsp
deleted file mode 100644
index 9ff2349..0000000
--- a/build/win32/pub2raw.dsp
+++ /dev/null
@@ -1,102 +0,0 @@
-# Microsoft Developer Studio Project File - Name="pub2raw" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=pub2raw - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "pub2raw.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "pub2raw.mak" CFG="pub2raw - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "pub2raw - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "pub2raw - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "pub2raw - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-MTL=midl.exe
-# ADD BASE MTL /nologo /win32
-# ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 libmspub-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\pub2raw.exe" /libpath:"Release\lib"
-# ADD LINK32 libmspub-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\pub2raw.exe" /libpath:"Release\lib"
-# SUBTRACT LINK32 /nodefaultlib
-
-!ELSEIF  "$(CFG)" == "pub2raw - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-MTL=midl.exe
-# ADD BASE MTL /nologo /win32
-# ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 libmspub-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\pub2raw.exe" /libpath:"Debug\lib"
-# ADD LINK32 libmspub-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib kernel32.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\pub2raw.exe" /libpath:"Debug\lib"
-# SUBTRACT LINK32 /nodefaultlib
-
-!ENDIF 
-
-# Begin Target
-
-# Name "pub2raw - Win32 Release"
-# Name "pub2raw - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-# Begin Source File
-
-SOURCE=..\..\src\conv\raw\pub2raw.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/build/win32/pub2raw.vcproj b/build/win32/pub2raw.vcproj
deleted file mode 100644
index 4d892a7..0000000
--- a/build/win32/pub2raw.vcproj
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="pub2raw"
-	ProjectGUID="{8F263821-9D45-4653-AC9F-0A306B82F3BB}"
-	RootNamespace="pub2raw"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/pub2raw.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
-				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="false"
-				PrecompiledHeaderFile=".\Debug/pub2raw.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libmspub-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
-				OutputFile="Debug\bin\pub2raw.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="Debug\lib,$(LIBWPD_LIB_DIR),$(ZLIB_LIB_DIR),$(ICU_LIB_DIR)"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/pub2raw.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/pub2raw.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/pub2raw.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
-				RuntimeLibrary="2"
-				TreatWChar_tAsBuiltInType="false"
-				PrecompiledHeaderFile=".\Release/pub2raw.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libmspub-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
-				OutputFile="Release\bin\pub2raw.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="Release\lib,$(LIBWPD_LIB_DIR),$(ZLIB_LIB_DIR),$(ICU_LIB_DIR)"
-				ProgramDatabaseFile=".\Release/pub2raw.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/pub2raw.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			>
-			<File
-				RelativePath="..\..\src\conv\raw\pub2raw.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/pub2raw.vcxproj b/build/win32/pub2raw.vcxproj
deleted file mode 100644
index 8651e9e..0000000
--- a/build/win32/pub2raw.vcxproj
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8F263821-9D45-4653-AC9F-0A306B82F3BB}</ProjectGuid>
-    <RootNamespace>pub2raw</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Debug/pub2raw.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderOutputFile>.\Debug/pub2raw.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
-      <ObjectFileName>.\Debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libmspub-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>Debug\bin\pub2raw.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\Debug/pub2raw.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Debug/pub2raw.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Release/pub2raw.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderOutputFile>.\Release/pub2raw.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
-      <ObjectFileName>.\Release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libmspub-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>Release\bin\pub2raw.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>.\Release/pub2raw.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release/pub2raw.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\conv\raw\pub2raw.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libmspub.vcxproj">
-      <Project>{775f637a-97de-4701-a690-e0f1b14a80d9}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/build/win32/pub2xhtml.dsp b/build/win32/pub2xhtml.dsp
deleted file mode 100644
index bf074ab..0000000
--- a/build/win32/pub2xhtml.dsp
+++ /dev/null
@@ -1,102 +0,0 @@
-# Microsoft Developer Studio Project File - Name="pub2xhtml" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=pub2xhtml - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "pub2xhtml.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "pub2xhtml.mak" CFG="pub2xhtml - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "pub2xhtml - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "pub2xhtml - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "pub2xhtml - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-MTL=midl.exe
-# ADD BASE MTL /nologo /win32
-# ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 libmspub-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\pub2xhtml.exe" /libpath:"Release\lib"
-# ADD LINK32 libmspub-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\pub2xhtml.exe" /libpath:"Release\lib"
-# SUBTRACT LINK32 /nodefaultlib
-
-!ELSEIF  "$(CFG)" == "pub2xhtml - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-MTL=midl.exe
-# ADD BASE MTL /nologo /win32
-# ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 libmspub-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\pub2xhtml.exe" /libpath:"Debug\lib"
-# ADD LINK32 libmspub-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\pub2xhtml.exe" /libpath:"Debug\lib"
-# SUBTRACT LINK32 /nodefaultlib
-
-!ENDIF 
-
-# Begin Target
-
-# Name "pub2xhtml - Win32 Release"
-# Name "pub2xhtml - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-# Begin Source File
-
-SOURCE=..\..\src\conv\svg\pub2xhtml.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/build/win32/pub2xhtml.vcproj b/build/win32/pub2xhtml.vcproj
deleted file mode 100644
index 35ea4f5..0000000
--- a/build/win32/pub2xhtml.vcproj
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="pub2xhtml"
-	ProjectGUID="{4ACAB1F6-15FB-45BE-B377-4DD3886CFB3A}"
-	RootNamespace="pub2xhtml"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/pub2xhtml.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
-				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="false"
-				PrecompiledHeaderFile=".\Debug/pub2xhtml.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libmspub-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
-				OutputFile="Debug\bin\pub2xhtml.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="Debug\lib,$(LIBWPD_LIB_DIR),$(ZLIB_LIB_DIR),$(ICU_LIB_DIR)"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/pub2xhtml.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/pub2xhtml.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/pub2xhtml.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
-				RuntimeLibrary="2"
-				TreatWChar_tAsBuiltInType="false"
-				PrecompiledHeaderFile=".\Release/pub2xhtml.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libmspub-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
-				OutputFile="Release\bin\pub2xhtml.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="Release\lib,$(LIBWPD_LIB_DIR),$(ZLIB_LIB_DIR),$(ICU_LIB_DIR)"
-				ProgramDatabaseFile=".\Release/pub2xhtml.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/pub2xhtml.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			>
-			<File
-				RelativePath="..\..\src\conv\svg\pub2xhtml.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/pub2xhtml.vcxproj b/build/win32/pub2xhtml.vcxproj
deleted file mode 100644
index 8f41eb6..0000000
--- a/build/win32/pub2xhtml.vcxproj
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4ACAB1F6-15FB-45BE-B377-4DD3886CFB3A}</ProjectGuid>
-    <RootNamespace>pub2xhtml</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Debug/pub2xhtml.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderOutputFile>.\Debug/pub2xhtml.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
-      <ObjectFileName>.\Debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libmspub-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>Debug\bin\pub2xhtml.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\Debug/pub2xhtml.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Debug/pub2xhtml.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Release/pub2xhtml.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderOutputFile>.\Release/pub2xhtml.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
-      <ObjectFileName>.\Release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libmspub-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>Release\bin\pub2xhtml.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>.\Release/pub2xhtml.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release/pub2xhtml.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\conv\svg\pub2xhtml.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libmspub.vcxproj">
-      <Project>{775f637a-97de-4701-a690-e0f1b14a80d9}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
commit 68d00f70c6ad2cc61b5106feb09d448ea5a4ffcb
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Oct 28 15:33:15 2017 +0200

    rely on pkg-config to detect zlib
    
    Change-Id: Iad145787e0fc3258859ead3efc0dd69e804ac5cb

diff --git a/configure.ac b/configure.ac
index 42b8ffc..2da6ffa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,12 +82,7 @@ AC_SUBST([REVENGE_GENERATORS_LIBS])
 # =========
 # Find zlib
 # =========
-PKG_CHECK_MODULES([ZLIB],[zlib],[],[
-    AC_CHECK_HEADER(zlib.h, [ZLIB_CFLAGS=],
-        [AC_MSG_ERROR(zlib.h not found. install zlib)], [])
-    AC_CHECK_LIB(z, inflate, [ ZLIB_LIBS=-lz ],
-        [AC_MSG_ERROR(zlib not found or functional)], [])
-])
+PKG_CHECK_MODULES([ZLIB],[zlib])
 AC_SUBST(ZLIB_CFLAGS)
 AC_SUBST(ZLIB_LIBS)
 
commit 7511392e07409d97b876c0ff68c1f43cac0720d2
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 16 09:43:39 2017 +0200

    drop :: prefix
    
    Change-Id: I07695f5d877422e109176563dba8cd1b3ffd6621

diff --git a/src/lib/MSPUBCollector.h b/src/lib/MSPUBCollector.h
index d40b021..728d1df 100644
--- a/src/lib/MSPUBCollector.h
+++ b/src/lib/MSPUBCollector.h
@@ -51,7 +51,7 @@ class MSPUBCollector
 public:
   typedef std::list<ContentChunkReference>::const_iterator ccr_iterator_t;
 
-  MSPUBCollector(::librevenge::RVNGDrawingInterface *painter);
+  MSPUBCollector(librevenge::RVNGDrawingInterface *painter);
   virtual ~MSPUBCollector();
 
   // collector functions


More information about the Libreoffice-commits mailing list