<div dir="ltr">Does this need additional external libraries in a specific place, like the curl and libicu libraries?<div><br></div><div>--Greg</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Mar 4, 2014 at 10:38 AM, <span dir="ltr"><<a href="mailto:chrislit@crosswire.org" target="_blank">chrislit@crosswire.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: chrislit<br>
Date: 2014-03-04 09:38:20 -0700 (Tue, 04 Mar 2014)<br>
New Revision: 3066<br>
<br>
Modified:<br>
trunk/lib/vcppmake/libsword.vcxproj<br>
trunk/utilities/vcppmake/imp2ld.vcxproj<br>
trunk/utilities/vcppmake/imp2vs.vcxproj<br>
trunk/utilities/vcppmake/mod2zmod.vcxproj<br>
trunk/utilities/vcppmake/osis2mod.vcxproj<br>
trunk/utilities/vcppmake/tei2mod.vcxproj<br>
Log:<br>
updated MSVC projects for bzip2/xz compression<br>
<br>
Modified: trunk/lib/vcppmake/libsword.vcxproj<br>
===================================================================<br>
--- trunk/lib/vcppmake/libsword.vcxproj 2014-03-04 16:36:56 UTC (rev 3065)<br>
+++ trunk/lib/vcppmake/libsword.vcxproj 2014-03-04 16:38:20 UTC (rev 3066)<br>
@@ -63,7 +63,7 @@<br>
<ClCompile><br>
<AdditionalOptions>/D _CRT_SECURE_NO_DEPRECATE %(AdditionalOptions)</AdditionalOptions><br>
<Optimization>Disabled</Optimization><br>
- <AdditionalIncludeDirectories>../../include;../../include/internal/regex;../../../icu-sword/include;../../src/utilfuns/win32;../../../curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
+ <AdditionalIncludeDirectories>../../include;../../include/internal/regex;../../../icu-sword/include;../../src/utilfuns/win32;../../../curl/include;../../../xz/include;../../../bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
<PreprocessorDefinitions>_DEBUG;_ICU_;_ICUSWORD_;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL;CURLAVAILABLE;CURL_STATICLIB;USBINARY;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions><br>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks><br>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary><br>
@@ -85,8 +85,8 @@<br>
<Culture>0x0409</Culture><br>
</ResourceCompile><br>
<Link><br>
- <AdditionalDependencies>libcurl_a.lib;ws2_32.lib;winmm.lib;wldap32.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
- <AdditionalLibraryDirectories>../../../curl/builds/libcurl-vc10-x86-release-static-ipv6-sspi-spnego-winssl/lib;../../../icu-sword/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
+ <AdditionalDependencies>libcurl_a.lib;ws2_32.lib;winmm.lib;wldap32.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
+ <AdditionalLibraryDirectories>../../../curl/builds/libcurl-vc10-x86-release-static-ipv6-sspi-spnego-winssl/lib;../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
<RandomizedBaseAddress>false</RandomizedBaseAddress><br>
<DataExecutionPrevention><br>
</DataExecutionPrevention><br>
@@ -99,7 +99,7 @@<br>
<ClCompile><br>
<Optimization>Full</Optimization><br>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion><br>
- <AdditionalIncludeDirectories>../../include;../../include/internal/regex;../../../icu-sword/include;../../src/utilfuns/win32;../../../curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
+ <AdditionalIncludeDirectories>../../include;../../include/internal/regex;../../../icu-sword/include;../../src/utilfuns/win32;../../../curl/include;../../../xz/include;../../../bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
<PreprocessorDefinitions>NDEBUG;_ICU_;_ICUSWORD_;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL;CURLAVAILABLE;CURL_STATICLIB;USBINARY;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions><br>
<StringPooling><br>
</StringPooling><br>
@@ -123,8 +123,8 @@<br>
<Culture>0x0409</Culture><br>
</ResourceCompile><br>
<Link><br>
- <AdditionalDependencies>libcurl_a.lib;ws2_32.lib;winmm.lib;wldap32.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
- <AdditionalLibraryDirectories>../../../curl/builds/libcurl-vc10-x86-release-static-ipv6-sspi-spnego-winssl/lib;../../../icu-sword/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
+ <AdditionalDependencies>libcurl_a.lib;ws2_32.lib;winmm.lib;wldap32.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
+ <AdditionalLibraryDirectories>../../../curl/builds/libcurl-vc10-x86-release-static-ipv6-sspi-spnego-winssl/lib;../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
<RandomizedBaseAddress>false</RandomizedBaseAddress><br>
<DataExecutionPrevention><br>
</DataExecutionPrevention><br>
<br>
Modified: trunk/utilities/vcppmake/imp2ld.vcxproj<br>
===================================================================<br>
--- trunk/utilities/vcppmake/imp2ld.vcxproj 2014-03-04 16:36:56 UTC (rev 3065)<br>
+++ trunk/utilities/vcppmake/imp2ld.vcxproj 2014-03-04 16:38:20 UTC (rev 3066)<br>
@@ -1,4 +1,4 @@<br>
-<?xml version="1.0" encoding="utf-8"?><br>
+<?xml version="1.0" encoding="utf-8"?><br>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="<a href="http://schemas.microsoft.com/developer/msbuild/2003" target="_blank">http://schemas.microsoft.com/developer/msbuild/2003</a>"><br>
<ItemGroup Label="ProjectConfigurations"><br>
<ProjectConfiguration Include="Debug|Win32"><br>
@@ -59,7 +59,7 @@<br>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"><br>
<ClCompile><br>
<Optimization>Disabled</Optimization><br>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
+ <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
<PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions><br>
<MinimalRebuild>true</MinimalRebuild><br>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks><br>
@@ -69,9 +69,9 @@<br>
<MultiProcessorCompilation>true</MultiProcessorCompilation><br>
</ClCompile><br>
<Link><br>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
+ <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
<OutputFile>Debug\$(ProjectName).exe</OutputFile><br>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
+ <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
<GenerateDebugInformation>true</GenerateDebugInformation><br>
<TargetMachine>MachineX86</TargetMachine><br>
<ImageHasSafeExceptionHandlers><br>
@@ -82,7 +82,7 @@<br>
<ClCompile><br>
<Optimization>Full</Optimization><br>
<IntrinsicFunctions>true</IntrinsicFunctions><br>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
+ <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
<PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions><br>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary><br>
<FunctionLevelLinking>true</FunctionLevelLinking><br>
@@ -93,9 +93,9 @@<br>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed><br>
</ClCompile><br>
<Link><br>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
+ <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
<OutputFile>Release\$(ProjectName).exe</OutputFile><br>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
+ <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
<GenerateDebugInformation>true</GenerateDebugInformation><br>
<OptimizeReferences>true</OptimizeReferences><br>
<EnableCOMDATFolding>true</EnableCOMDATFolding><br>
<br>
Modified: trunk/utilities/vcppmake/imp2vs.vcxproj<br>
===================================================================<br>
--- trunk/utilities/vcppmake/imp2vs.vcxproj 2014-03-04 16:36:56 UTC (rev 3065)<br>
+++ trunk/utilities/vcppmake/imp2vs.vcxproj 2014-03-04 16:38:20 UTC (rev 3066)<br>
@@ -1,4 +1,4 @@<br>
-<?xml version="1.0" encoding="utf-8"?><br>
+<?xml version="1.0" encoding="utf-8"?><br>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="<a href="http://schemas.microsoft.com/developer/msbuild/2003" target="_blank">http://schemas.microsoft.com/developer/msbuild/2003</a>"><br>
<ItemGroup Label="ProjectConfigurations"><br>
<ProjectConfiguration Include="Debug|Win32"><br>
@@ -59,7 +59,7 @@<br>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"><br>
<ClCompile><br>
<Optimization>Disabled</Optimization><br>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
+ <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
<PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions><br>
<MinimalRebuild>true</MinimalRebuild><br>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks><br>
@@ -69,9 +69,9 @@<br>
<MultiProcessorCompilation>true</MultiProcessorCompilation><br>
</ClCompile><br>
<Link><br>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
+ <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
<OutputFile>Debug\$(ProjectName).exe</OutputFile><br>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
+ <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
<GenerateDebugInformation>true</GenerateDebugInformation><br>
<TargetMachine>MachineX86</TargetMachine><br>
<ImageHasSafeExceptionHandlers><br>
@@ -82,7 +82,7 @@<br>
<ClCompile><br>
<Optimization>Full</Optimization><br>
<IntrinsicFunctions>true</IntrinsicFunctions><br>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
+ <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
<PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions><br>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary><br>
<FunctionLevelLinking>true</FunctionLevelLinking><br>
@@ -93,9 +93,9 @@<br>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed><br>
</ClCompile><br>
<Link><br>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
+ <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
<OutputFile>Release\$(ProjectName).exe</OutputFile><br>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
+ <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
<GenerateDebugInformation>true</GenerateDebugInformation><br>
<OptimizeReferences>true</OptimizeReferences><br>
<EnableCOMDATFolding>true</EnableCOMDATFolding><br>
<br>
Modified: trunk/utilities/vcppmake/mod2zmod.vcxproj<br>
===================================================================<br>
--- trunk/utilities/vcppmake/mod2zmod.vcxproj 2014-03-04 16:36:56 UTC (rev 3065)<br>
+++ trunk/utilities/vcppmake/mod2zmod.vcxproj 2014-03-04 16:38:20 UTC (rev 3066)<br>
@@ -1,4 +1,4 @@<br>
-<?xml version="1.0" encoding="utf-8"?><br>
+<?xml version="1.0" encoding="utf-8"?><br>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="<a href="http://schemas.microsoft.com/developer/msbuild/2003" target="_blank">http://schemas.microsoft.com/developer/msbuild/2003</a>"><br>
<ItemGroup Label="ProjectConfigurations"><br>
<ProjectConfiguration Include="Debug|Win32"><br>
@@ -59,7 +59,7 @@<br>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"><br>
<ClCompile><br>
<Optimization>Disabled</Optimization><br>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
+ <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
<PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions><br>
<MinimalRebuild>true</MinimalRebuild><br>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks><br>
@@ -68,9 +68,9 @@<br>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat><br>
</ClCompile><br>
<Link><br>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
+ <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
<OutputFile>Debug\$(ProjectName).exe</OutputFile><br>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
+ <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
<GenerateDebugInformation>true</GenerateDebugInformation><br>
<TargetMachine>MachineX86</TargetMachine><br>
<ImageHasSafeExceptionHandlers><br>
@@ -81,7 +81,7 @@<br>
<ClCompile><br>
<Optimization>Full</Optimization><br>
<IntrinsicFunctions>true</IntrinsicFunctions><br>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
+ <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
<PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions><br>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary><br>
<FunctionLevelLinking>true</FunctionLevelLinking><br>
@@ -92,9 +92,9 @@<br>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed><br>
</ClCompile><br>
<Link><br>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
+ <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
<OutputFile>Release\$(ProjectName).exe</OutputFile><br>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
+ <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
<GenerateDebugInformation>true</GenerateDebugInformation><br>
<OptimizeReferences>true</OptimizeReferences><br>
<EnableCOMDATFolding>true</EnableCOMDATFolding><br>
<br>
Modified: trunk/utilities/vcppmake/osis2mod.vcxproj<br>
===================================================================<br>
--- trunk/utilities/vcppmake/osis2mod.vcxproj 2014-03-04 16:36:56 UTC (rev 3065)<br>
+++ trunk/utilities/vcppmake/osis2mod.vcxproj 2014-03-04 16:38:20 UTC (rev 3066)<br>
@@ -1,4 +1,4 @@<br>
-<?xml version="1.0" encoding="utf-8"?><br>
+<?xml version="1.0" encoding="utf-8"?><br>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="<a href="http://schemas.microsoft.com/developer/msbuild/2003" target="_blank">http://schemas.microsoft.com/developer/msbuild/2003</a>"><br>
<ItemGroup Label="ProjectConfigurations"><br>
<ProjectConfiguration Include="Debug|Win32"><br>
@@ -59,7 +59,7 @@<br>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"><br>
<ClCompile><br>
<Optimization>Disabled</Optimization><br>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
+ <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
<PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions><br>
<MinimalRebuild>true</MinimalRebuild><br>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks><br>
@@ -69,9 +69,9 @@<br>
<MultiProcessorCompilation>true</MultiProcessorCompilation><br>
</ClCompile><br>
<Link><br>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
+ <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
<OutputFile>Debug\$(ProjectName).exe</OutputFile><br>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
+ <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
<GenerateDebugInformation>true</GenerateDebugInformation><br>
<TargetMachine>MachineX86</TargetMachine><br>
<ImageHasSafeExceptionHandlers><br>
@@ -86,7 +86,7 @@<br>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed><br>
<WholeProgramOptimization><br>
</WholeProgramOptimization><br>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
+ <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
<PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions><br>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary><br>
<FunctionLevelLinking>false</FunctionLevelLinking><br>
@@ -95,9 +95,9 @@<br>
<MultiProcessorCompilation>true</MultiProcessorCompilation><br>
</ClCompile><br>
<Link><br>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
+ <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
<OutputFile>Release\$(ProjectName).exe</OutputFile><br>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
+ <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
<GenerateDebugInformation>true</GenerateDebugInformation><br>
<OptimizeReferences><br>
</OptimizeReferences><br>
<br>
Modified: trunk/utilities/vcppmake/tei2mod.vcxproj<br>
===================================================================<br>
--- trunk/utilities/vcppmake/tei2mod.vcxproj 2014-03-04 16:36:56 UTC (rev 3065)<br>
+++ trunk/utilities/vcppmake/tei2mod.vcxproj 2014-03-04 16:38:20 UTC (rev 3066)<br>
@@ -1,4 +1,4 @@<br>
-<?xml version="1.0" encoding="utf-8"?><br>
+<?xml version="1.0" encoding="utf-8"?><br>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="<a href="http://schemas.microsoft.com/developer/msbuild/2003" target="_blank">http://schemas.microsoft.com/developer/msbuild/2003</a>"><br>
<ItemGroup Label="ProjectConfigurations"><br>
<ProjectConfiguration Include="Debug|Win32"><br>
@@ -59,7 +59,7 @@<br>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"><br>
<ClCompile><br>
<Optimization>Disabled</Optimization><br>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
+ <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
<PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions><br>
<MinimalRebuild>true</MinimalRebuild><br>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks><br>
@@ -69,9 +69,9 @@<br>
<MultiProcessorCompilation>true</MultiProcessorCompilation><br>
</ClCompile><br>
<Link><br>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
+ <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
<OutputFile>Debug\$(ProjectName).exe</OutputFile><br>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
+ <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
<GenerateDebugInformation>true</GenerateDebugInformation><br>
<TargetMachine>MachineX86</TargetMachine><br>
<ImageHasSafeExceptionHandlers><br>
@@ -82,7 +82,7 @@<br>
<ClCompile><br>
<Optimization>Full</Optimization><br>
<IntrinsicFunctions>true</IntrinsicFunctions><br>
- <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
+ <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
<PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions><br>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary><br>
<FunctionLevelLinking>true</FunctionLevelLinking><br>
@@ -93,9 +93,9 @@<br>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed><br>
</ClCompile><br>
<Link><br>
- <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
+ <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies><br>
<OutputFile>Release\$(ProjectName).exe</OutputFile><br>
- <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
+ <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories><br>
<GenerateDebugInformation>true</GenerateDebugInformation><br>
<OptimizeReferences>true</OptimizeReferences><br>
<EnableCOMDATFolding>true</EnableCOMDATFolding><br>
<br>
<br>
_______________________________________________<br>
sword-cvs mailing list<br>
<a href="mailto:sword-cvs@crosswire.org">sword-cvs@crosswire.org</a><br>
<a href="http://www.crosswire.org/mailman/listinfo/sword-cvs" target="_blank">http://www.crosswire.org/mailman/listinfo/sword-cvs</a><br>
</blockquote></div><br></div>