[Libreoffice-commits] libvisio.git: Branch 'zf.com' - build/win32
Jiří Pospíšil
jiri.pospisil.certicon at zf.com
Thu Dec 15 16:44:12 UTC 2016
build/win32/libvisio.vcxproj | 68 +++++++++++++++++++-----------------------
build/win32/vsd2raw.vcxproj | 40 ++++++++++++------------
build/win32/vsd2xhtml.vcxproj | 66 ++++++++++++++++++++++++++++------------
3 files changed, 97 insertions(+), 77 deletions(-)
New commits:
commit ef4ae42ce738fc2450bfc5dc205a65003c04455b
Author: Jiří Pospíšil <jiri.pospisil.certicon at zf.com>
Date: Thu Dec 15 12:58:46 2016 +0100
Project build fixes
diff --git a/build/win32/libvisio.vcxproj b/build/win32/libvisio.vcxproj
index 0413aff..c8cad9f 100644
--- a/build/win32/libvisio.vcxproj
+++ b/build/win32/libvisio.vcxproj
@@ -35,24 +35,24 @@
<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>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\lib\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\lib\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\lib\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\lib\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(LIBXML_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\inc;..\..\src\lib;..\..\src\lib\preprocess;..\..\src\lib\preprocess\windows;$(BOOST_DIR);$(ICONV_DIR)\include;$(ICU_DIR)\include;$(LIBRVNG_DIR)\inc;$(LIBXML_DIR)\include;$(ZLIB_DIR)\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeaderOutputFile>.\Debug/libvisio.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
- <ObjectFileName>.\Debug/</ObjectFileName>
- <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+ <PrecompiledHeaderOutputFile>$(TargetDir)/libvisio.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(TargetDir)</AssemblerListingLocation>
+ <ObjectFileName>$(TargetDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(TargetDir)</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -62,8 +62,10 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>Debug\lib\libvisio-0.0.lib</OutputFile>
+ <OutputFile>$(TargetPath)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalDependencies>$(ICU_DIR)\lib\icuuc.lib;$(LIBXML_DIR)\lib\libxml2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
</Lib>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -74,17 +76,17 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(LIBXML_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\inc;..\..\src\lib;..\..\src\lib\preprocess;..\..\src\lib\preprocess\windows;$(BOOST_DIR);$(ICONV_DIR)\include;$(ICU_DIR)\include;$(LIBRVNG_DIR)\inc;$(LIBXML_DIR)\include;$(ZLIB_DIR)\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeaderOutputFile>.\Release/libvisio.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
- <ObjectFileName>.\Release/</ObjectFileName>
- <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+ <PrecompiledHeaderOutputFile>$(TargetDir)/libvisio.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(TargetDir)</AssemblerListingLocation>
+ <ObjectFileName>$(TargetDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(TargetDir)</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
</ClCompile>
@@ -93,8 +95,9 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>Release\lib\libvisio-0.0.lib</OutputFile>
+ <OutputFile>$(TargetPath)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalDependencies>$(ICU_DIR)\lib\icuuc.lib;$(LIBXML_DIR)\lib\libxml2.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -198,12 +201,6 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\lib\librevenge::RVNGStringVector.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>
<ClCompile Include="..\..\src\lib\VSDStyles.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -216,12 +213,7 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\lib\VSDSVGGenerator.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>
+ <ClCompile Include="..\..\src\lib\VSDXMetaData.cpp" />
<ClCompile Include="..\..\src\lib\VSDXMLHelper.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -252,17 +244,10 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\lib\VSDZipStream.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>
<ClInclude Include="..\..\inc\libvisio\libvisio.h" />
<ClInclude Include="..\..\inc\libvisio\VisioDocument.h" />
- <ClInclude Include="..\..\inc\libvisio\librevenge::RVNGStringVector.h" />
<ClInclude Include="..\..\src\lib\libvisio_utils.h" />
<ClInclude Include="..\..\src\lib\tokenhash.h" />
<ClInclude Include="..\..\src\lib\tokens.h" />
@@ -284,14 +269,23 @@
<ClInclude Include="..\..\src\lib\VSDStencils.h" />
<ClInclude Include="..\..\src\lib\VSDStyles.h" />
<ClInclude Include="..\..\src\lib\VSDStylesCollector.h" />
- <ClInclude Include="..\..\src\lib\VSDSVGGenerator.h" />
<ClInclude Include="..\..\src\lib\VSDTypes.h" />
+ <ClInclude Include="..\..\src\lib\VSDXMetaData.h" />
<ClInclude Include="..\..\src\lib\VSDXMLHelper.h" />
<ClInclude Include="..\..\src\lib\VSDXMLParserBase.h" />
<ClInclude Include="..\..\src\lib\VSDXMLTokenMap.h" />
<ClInclude Include="..\..\src\lib\VSDXParser.h" />
<ClInclude Include="..\..\src\lib\VSDXTheme.h" />
- <ClInclude Include="..\..\src\lib\VSDZipStream.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="$(LIBRVNG_DIR)\build\win32\librevenge.vcxproj">
+ <Project>{740f0d46-431f-11e3-b75a-d067e5eab6e3}</Project>
+ <Private>true</Private>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+ <LinkLibraryDependencies>false</LinkLibraryDependencies>
+ <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/build/win32/vsd2raw.vcxproj b/build/win32/vsd2raw.vcxproj
index 4669ef0..26cb047 100644
--- a/build/win32/vsd2raw.vcxproj
+++ b/build/win32/vsd2raw.vcxproj
@@ -52,30 +52,30 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\inc;$(LIBRVNG_DIR)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
- <PrecompiledHeaderOutputFile>.\Debug/vsd2raw.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
- <ObjectFileName>.\Debug/</ObjectFileName>
- <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+ <PrecompiledHeaderOutputFile>$(TargetDir)/vsd2raw.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(TargetDir)</AssemblerListingLocation>
+ <ObjectFileName>$(TargetDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(TargetDir)</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libvisio-0.0.lib;librevenge-0.9.lib;librevenge-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\bin\vsd2raw.exe</OutputFile>
+ <AdditionalDependencies>$(BOOST_DIR)\bin.v2\libs\thread\build\msvc-10.0\dbg\lnk-sttc\thrd-mlt\libboost_thread-vc100-mt-gd-1_62.lib;$(BOOST_DIR)\bin.v2\libs\system\build\msvc-10.0\dbg\lnk-sttc\thrd-mlt\libboost_system-vc100-mt-gd-1_62.lib;$(BOOST_DIR)\bin.v2\libs\date_time\build\msvc-10.0\dbg\lnk-sttc\thrd-mlt\libboost_date_time-vc100-mt-gd-1_62.lib;$(BOOST_DIR)\bin.v2\libs\chrono\build\msvc-10.0\dbg\lnk-sttc\thrd-mlt\libboost_chrono-vc100-mt-gd-1_62.lib;$(LIBRVNG_DIR)\build\win32\Debug\librevenge.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(TargetPath)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LIBXML_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(TargetDir)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>.\Debug/vsd2raw.pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(TargetDir)\vsd2raw.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -96,14 +96,14 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ICU_LIB_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\inc;$(LIBRVNG_DIR)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
- <PrecompiledHeaderOutputFile>.\Release/vsd2raw.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
- <ObjectFileName>.\Release/</ObjectFileName>
- <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+ <PrecompiledHeaderOutputFile>$(TargetDir)/vsd2raw.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(TargetDir)</AssemblerListingLocation>
+ <ObjectFileName>$(TargetDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(TargetDir)</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
</ClCompile>
@@ -112,11 +112,11 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libvisio-0.0.lib;librevenge-0.9.lib;librevenge-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\bin\vsd2raw.exe</OutputFile>
+ <AdditionalDependencies>$(BOOST_DIR)\bin.v2\libs\thread\build\msvc-10.0\rls\lnk-sttc\thrd-mlt\libboost_thread-vc100-mt-1_62.lib;$(BOOST_DIR)\bin.v2\libs\system\build\msvc-10.0\rls\lnk-sttc\thrd-mlt\libboost_system-vc100-mt-1_62.lib;$(BOOST_DIR)\bin.v2\libs\date_time\build\msvc-10.0\rls\lnk-sttc\thrd-mlt\libboost_date_time-vc100-mt-1_62.lib;$(BOOST_DIR)\bin.v2\libs\chrono\build\msvc-10.0\rls\lnk-sttc\thrd-mlt\libboost_chrono-vc100-mt-1_62.lib;$(LIBRVNG_DIR)\build\win32\Release\librevenge.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(TargetPath)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LIBXML_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ProgramDatabaseFile>.\Release/vsd2raw.pdb</ProgramDatabaseFile>
+ <AdditionalLibraryDirectories>$(TargetDir)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ProgramDatabaseFile>$(TargetDir)\vsd2raw.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -144,4 +144,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/win32/vsd2xhtml.vcxproj b/build/win32/vsd2xhtml.vcxproj
index 1521c6c..4d71642 100644
--- a/build/win32/vsd2xhtml.vcxproj
+++ b/build/win32/vsd2xhtml.vcxproj
@@ -41,6 +41,11 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Projects\boost_1_62_0;$(IncludePath)</IncludePath>
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Projects\boost_1_62_0;$(IncludePath)</IncludePath>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LibraryPath)</LibraryPath>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LibraryPath)</LibraryPath>
+ <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</IgnoreImportLibrary>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
@@ -52,36 +57,46 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\inc;$(LIBRVNG_DIR)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
- <PrecompiledHeaderOutputFile>.\Release/vsd2xhtml.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
- <ObjectFileName>.\Release/</ObjectFileName>
- <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+ <PrecompiledHeaderOutputFile>$(TargetDir)/vsd2xhtml.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(TargetDir)</AssemblerListingLocation>
+ <ObjectFileName>$(TargetDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(TargetDir)</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
+ <BrowseInformation>false</BrowseInformation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libvisio-0.0.lib;librevenge-0.9.lib;librevenge-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Release\bin\vsd2xhtml.exe</OutputFile>
+ <AdditionalDependencies>$(BOOST_DIR)\bin.v2\libs\thread\build\msvc-10.0\rls\lnk-sttc\thrd-mlt\libboost_thread-vc100-mt-1_62.lib;$(BOOST_DIR)\bin.v2\libs\system\build\msvc-10.0\rls\lnk-sttc\thrd-mlt\libboost_system-vc100-mt-1_62.lib;$(BOOST_DIR)\bin.v2\libs\date_time\build\msvc-10.0\rls\lnk-sttc\thrd-mlt\libboost_date_time-vc100-mt-1_62.lib;$(BOOST_DIR)\bin.v2\libs\chrono\build\msvc-10.0\rls\lnk-sttc\thrd-mlt\libboost_chrono-vc100-mt-1_62.lib;$(LIBRVNG_DIR)\build\win32\Release\librevenge.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(TargetPath)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LIBXML_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ProgramDatabaseFile>.\Release/vsd2xhtml.pdb</ProgramDatabaseFile>
+ <AdditionalLibraryDirectories>$(TargetDir)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ProgramDatabaseFile>$(TargetDir)\vsd2xhtml.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\Release/vsd2xhtml.bsc</OutputFile>
</Bscmake>
+ <PostBuildEvent>
+ <Command>xcopy /Y $(ICONV_DIR)\bin\iconv.dll Release
+xcopy /Y $(ICU_DIR)\bin\icudt40.dll Release
+xcopy /Y $(ICU_DIR)\bin\icuuc40.dll Release
+xcopy /Y $(LIBXML_DIR)\bin\libxml2.dll Release
+xcopy /Y $(ZLIB_DIR)\bin\zlib1.dll Release
+</Command>
+ </PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -93,30 +108,30 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\inc;$(LIBRVNG_DIR)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
- <PrecompiledHeaderOutputFile>.\Debug/vsd2xhtml.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
- <ObjectFileName>.\Debug/</ObjectFileName>
- <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+ <PrecompiledHeaderOutputFile>$(TargetDir)/vsd2xhtml.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(TargetDir)</AssemblerListingLocation>
+ <ObjectFileName>$(TargetDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(TargetDir)</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libvisio-0.0.lib;librevenge-0.9.lib;librevenge-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>Debug\bin\vsd2xhtml.exe</OutputFile>
+ <AdditionalDependencies>$(BOOST_DIR)\bin.v2\libs\thread\build\msvc-10.0\dbg\lnk-sttc\thrd-mlt\libboost_thread-vc100-mt-gd-1_62.lib;$(BOOST_DIR)\bin.v2\libs\system\build\msvc-10.0\dbg\lnk-sttc\thrd-mlt\libboost_system-vc100-mt-gd-1_62.lib;$(BOOST_DIR)\bin.v2\libs\date_time\build\msvc-10.0\dbg\lnk-sttc\thrd-mlt\libboost_date_time-vc100-mt-gd-1_62.lib;$(BOOST_DIR)\bin.v2\libs\chrono\build\msvc-10.0\dbg\lnk-sttc\thrd-mlt\libboost_chrono-vc100-mt-gd-1_62.lib;$(LIBRVNG_DIR)\build\win32\Debug\librevenge.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(TargetPath)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LIBXML_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(TargetDir)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>.\Debug/vsd2xhtml.pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(TargetDir)\vsd2xhtml.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -126,6 +141,13 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\Debug/vsd2xhtml.bsc</OutputFile>
</Bscmake>
+ <PostBuildEvent>
+ <Command>xcopy /Y $(ICONV_DIR)\bin\iconv.dll Debug
+xcopy /Y $(ICU_DIR)\bin\icudt40.dll Debug
+xcopy /Y $(ICU_DIR)\bin\icuuc40.dll Debug
+xcopy /Y $(LIBXML_DIR)\bin\libxml2.dll Debug
+xcopy /Y $(ZLIB_DIR)\bin\zlib1.dll Debug</Command>
+ </PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\src\conv\svg\vsd2xhtml.cpp">
@@ -138,10 +160,14 @@
<ItemGroup>
<ProjectReference Include="libvisio.vcxproj">
<Project>{63fa9674-13e4-4a2c-a8e2-8965980eb7f7}</Project>
+ <Private>true</Private>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+ <LinkLibraryDependencies>true</LinkLibraryDependencies>
+ <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
More information about the Libreoffice-commits
mailing list