[sword-svn] r3066 - in trunk: lib/vcppmake utilities/vcppmake
Greg Hellings
greg.hellings at gmail.com
Tue Mar 4 09:34:45 MST 2014
Does this need additional external libraries in a specific place, like the
curl and libicu libraries?
--Greg
On Tue, Mar 4, 2014 at 10:38 AM, <chrislit at crosswire.org> wrote:
> Author: chrislit
> Date: 2014-03-04 09:38:20 -0700 (Tue, 04 Mar 2014)
> New Revision: 3066
>
> Modified:
> trunk/lib/vcppmake/libsword.vcxproj
> trunk/utilities/vcppmake/imp2ld.vcxproj
> trunk/utilities/vcppmake/imp2vs.vcxproj
> trunk/utilities/vcppmake/mod2zmod.vcxproj
> trunk/utilities/vcppmake/osis2mod.vcxproj
> trunk/utilities/vcppmake/tei2mod.vcxproj
> Log:
> updated MSVC projects for bzip2/xz compression
>
> Modified: trunk/lib/vcppmake/libsword.vcxproj
> ===================================================================
> --- trunk/lib/vcppmake/libsword.vcxproj 2014-03-04 16:36:56 UTC (rev 3065)
> +++ trunk/lib/vcppmake/libsword.vcxproj 2014-03-04 16:38:20 UTC (rev 3066)
> @@ -63,7 +63,7 @@
> <ClCompile>
> <AdditionalOptions>/D _CRT_SECURE_NO_DEPRECATE
> %(AdditionalOptions)</AdditionalOptions>
> <Optimization>Disabled</Optimization>
> -
> <AdditionalIncludeDirectories>../../include;../../include/internal/regex;../../../icu-sword/include;../../src/utilfuns/win32;../../../curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>../../include;../../include/internal/regex;../../../icu-sword/include;../../src/utilfuns/win32;../../../curl/include;../../../xz/include;../../../bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>
> <PreprocessorDefinitions>_DEBUG;_ICU_;_ICUSWORD_;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL;CURLAVAILABLE;CURL_STATICLIB;USBINARY;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
> @@ -85,8 +85,8 @@
> <Culture>0x0409</Culture>
> </ResourceCompile>
> <Link>
> -
> <AdditionalDependencies>libcurl_a.lib;ws2_32.lib;winmm.lib;wldap32.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
> -
> <AdditionalLibraryDirectories>../../../curl/builds/libcurl-vc10-x86-release-static-ipv6-sspi-spnego-winssl/lib;../../../icu-sword/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> +
> <AdditionalDependencies>libcurl_a.lib;ws2_32.lib;winmm.lib;wldap32.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies>
> +
> <AdditionalLibraryDirectories>../../../curl/builds/libcurl-vc10-x86-release-static-ipv6-sspi-spnego-winssl/lib;../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> <RandomizedBaseAddress>false</RandomizedBaseAddress>
> <DataExecutionPrevention>
> </DataExecutionPrevention>
> @@ -99,7 +99,7 @@
> <ClCompile>
> <Optimization>Full</Optimization>
> <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
> -
> <AdditionalIncludeDirectories>../../include;../../include/internal/regex;../../../icu-sword/include;../../src/utilfuns/win32;../../../curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>../../include;../../include/internal/regex;../../../icu-sword/include;../../src/utilfuns/win32;../../../curl/include;../../../xz/include;../../../bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>
> <PreprocessorDefinitions>NDEBUG;_ICU_;_ICUSWORD_;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL;CURLAVAILABLE;CURL_STATICLIB;USBINARY;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
> <StringPooling>
> </StringPooling>
> @@ -123,8 +123,8 @@
> <Culture>0x0409</Culture>
> </ResourceCompile>
> <Link>
> -
> <AdditionalDependencies>libcurl_a.lib;ws2_32.lib;winmm.lib;wldap32.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
> -
> <AdditionalLibraryDirectories>../../../curl/builds/libcurl-vc10-x86-release-static-ipv6-sspi-spnego-winssl/lib;../../../icu-sword/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> +
> <AdditionalDependencies>libcurl_a.lib;ws2_32.lib;winmm.lib;wldap32.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies>
> +
> <AdditionalLibraryDirectories>../../../curl/builds/libcurl-vc10-x86-release-static-ipv6-sspi-spnego-winssl/lib;../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> <RandomizedBaseAddress>false</RandomizedBaseAddress>
> <DataExecutionPrevention>
> </DataExecutionPrevention>
>
> Modified: trunk/utilities/vcppmake/imp2ld.vcxproj
> ===================================================================
> --- trunk/utilities/vcppmake/imp2ld.vcxproj 2014-03-04 16:36:56 UTC
> (rev 3065)
> +++ trunk/utilities/vcppmake/imp2ld.vcxproj 2014-03-04 16:38:20 UTC
> (rev 3066)
> @@ -1,4 +1,4 @@
> -<?xml version="1.0" encoding="utf-8"?>
> +<?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">
> @@ -59,7 +59,7 @@
> <ItemDefinitionGroup
> Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
> <ClCompile>
> <Optimization>Disabled</Optimization>
> -
> <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>
> <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
> <MinimalRebuild>true</MinimalRebuild>
> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
> @@ -69,9 +69,9 @@
> <MultiProcessorCompilation>true</MultiProcessorCompilation>
> </ClCompile>
> <Link>
> -
> <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
> +
> <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies>
> <OutputFile>Debug\$(ProjectName).exe</OutputFile>
> -
> <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> +
> <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> <GenerateDebugInformation>true</GenerateDebugInformation>
> <TargetMachine>MachineX86</TargetMachine>
> <ImageHasSafeExceptionHandlers>
> @@ -82,7 +82,7 @@
> <ClCompile>
> <Optimization>Full</Optimization>
> <IntrinsicFunctions>true</IntrinsicFunctions>
> -
> <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>
> <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
> <FunctionLevelLinking>true</FunctionLevelLinking>
> @@ -93,9 +93,9 @@
> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
> </ClCompile>
> <Link>
> -
> <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
> +
> <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies>
> <OutputFile>Release\$(ProjectName).exe</OutputFile>
> -
> <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> +
> <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> <GenerateDebugInformation>true</GenerateDebugInformation>
> <OptimizeReferences>true</OptimizeReferences>
> <EnableCOMDATFolding>true</EnableCOMDATFolding>
>
> Modified: trunk/utilities/vcppmake/imp2vs.vcxproj
> ===================================================================
> --- trunk/utilities/vcppmake/imp2vs.vcxproj 2014-03-04 16:36:56 UTC
> (rev 3065)
> +++ trunk/utilities/vcppmake/imp2vs.vcxproj 2014-03-04 16:38:20 UTC
> (rev 3066)
> @@ -1,4 +1,4 @@
> -<?xml version="1.0" encoding="utf-8"?>
> +<?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">
> @@ -59,7 +59,7 @@
> <ItemDefinitionGroup
> Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
> <ClCompile>
> <Optimization>Disabled</Optimization>
> -
> <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>
> <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
> <MinimalRebuild>true</MinimalRebuild>
> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
> @@ -69,9 +69,9 @@
> <MultiProcessorCompilation>true</MultiProcessorCompilation>
> </ClCompile>
> <Link>
> -
> <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
> +
> <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies>
> <OutputFile>Debug\$(ProjectName).exe</OutputFile>
> -
> <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> +
> <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> <GenerateDebugInformation>true</GenerateDebugInformation>
> <TargetMachine>MachineX86</TargetMachine>
> <ImageHasSafeExceptionHandlers>
> @@ -82,7 +82,7 @@
> <ClCompile>
> <Optimization>Full</Optimization>
> <IntrinsicFunctions>true</IntrinsicFunctions>
> -
> <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>
> <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
> <FunctionLevelLinking>true</FunctionLevelLinking>
> @@ -93,9 +93,9 @@
> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
> </ClCompile>
> <Link>
> -
> <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
> +
> <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies>
> <OutputFile>Release\$(ProjectName).exe</OutputFile>
> -
> <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> +
> <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> <GenerateDebugInformation>true</GenerateDebugInformation>
> <OptimizeReferences>true</OptimizeReferences>
> <EnableCOMDATFolding>true</EnableCOMDATFolding>
>
> Modified: trunk/utilities/vcppmake/mod2zmod.vcxproj
> ===================================================================
> --- trunk/utilities/vcppmake/mod2zmod.vcxproj 2014-03-04 16:36:56 UTC
> (rev 3065)
> +++ trunk/utilities/vcppmake/mod2zmod.vcxproj 2014-03-04 16:38:20 UTC
> (rev 3066)
> @@ -1,4 +1,4 @@
> -<?xml version="1.0" encoding="utf-8"?>
> +<?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">
> @@ -59,7 +59,7 @@
> <ItemDefinitionGroup
> Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
> <ClCompile>
> <Optimization>Disabled</Optimization>
> -
> <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>
> <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
> <MinimalRebuild>true</MinimalRebuild>
> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
> @@ -68,9 +68,9 @@
> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
> </ClCompile>
> <Link>
> -
> <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
> +
> <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies>
> <OutputFile>Debug\$(ProjectName).exe</OutputFile>
> -
> <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> +
> <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> <GenerateDebugInformation>true</GenerateDebugInformation>
> <TargetMachine>MachineX86</TargetMachine>
> <ImageHasSafeExceptionHandlers>
> @@ -81,7 +81,7 @@
> <ClCompile>
> <Optimization>Full</Optimization>
> <IntrinsicFunctions>true</IntrinsicFunctions>
> -
> <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>
> <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
> <FunctionLevelLinking>true</FunctionLevelLinking>
> @@ -92,9 +92,9 @@
> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
> </ClCompile>
> <Link>
> -
> <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
> +
> <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies>
> <OutputFile>Release\$(ProjectName).exe</OutputFile>
> -
> <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> +
> <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> <GenerateDebugInformation>true</GenerateDebugInformation>
> <OptimizeReferences>true</OptimizeReferences>
> <EnableCOMDATFolding>true</EnableCOMDATFolding>
>
> Modified: trunk/utilities/vcppmake/osis2mod.vcxproj
> ===================================================================
> --- trunk/utilities/vcppmake/osis2mod.vcxproj 2014-03-04 16:36:56 UTC
> (rev 3065)
> +++ trunk/utilities/vcppmake/osis2mod.vcxproj 2014-03-04 16:38:20 UTC
> (rev 3066)
> @@ -1,4 +1,4 @@
> -<?xml version="1.0" encoding="utf-8"?>
> +<?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">
> @@ -59,7 +59,7 @@
> <ItemDefinitionGroup
> Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
> <ClCompile>
> <Optimization>Disabled</Optimization>
> -
> <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>
> <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
> <MinimalRebuild>true</MinimalRebuild>
> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
> @@ -69,9 +69,9 @@
> <MultiProcessorCompilation>true</MultiProcessorCompilation>
> </ClCompile>
> <Link>
> -
> <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
> +
> <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies>
> <OutputFile>Debug\$(ProjectName).exe</OutputFile>
> -
> <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> +
> <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> <GenerateDebugInformation>true</GenerateDebugInformation>
> <TargetMachine>MachineX86</TargetMachine>
> <ImageHasSafeExceptionHandlers>
> @@ -86,7 +86,7 @@
> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
> <WholeProgramOptimization>
> </WholeProgramOptimization>
> -
> <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>
> <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
> <FunctionLevelLinking>false</FunctionLevelLinking>
> @@ -95,9 +95,9 @@
> <MultiProcessorCompilation>true</MultiProcessorCompilation>
> </ClCompile>
> <Link>
> -
> <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
> +
> <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies>
> <OutputFile>Release\$(ProjectName).exe</OutputFile>
> -
> <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> +
> <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> <GenerateDebugInformation>true</GenerateDebugInformation>
> <OptimizeReferences>
> </OptimizeReferences>
>
> Modified: trunk/utilities/vcppmake/tei2mod.vcxproj
> ===================================================================
> --- trunk/utilities/vcppmake/tei2mod.vcxproj 2014-03-04 16:36:56 UTC
> (rev 3065)
> +++ trunk/utilities/vcppmake/tei2mod.vcxproj 2014-03-04 16:38:20 UTC
> (rev 3066)
> @@ -1,4 +1,4 @@
> -<?xml version="1.0" encoding="utf-8"?>
> +<?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">
> @@ -59,7 +59,7 @@
> <ItemDefinitionGroup
> Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
> <ClCompile>
> <Optimization>Disabled</Optimization>
> -
> <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>
> <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
> <MinimalRebuild>true</MinimalRebuild>
> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
> @@ -69,9 +69,9 @@
> <MultiProcessorCompilation>true</MultiProcessorCompilation>
> </ClCompile>
> <Link>
> -
> <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
> +
> <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies>
> <OutputFile>Debug\$(ProjectName).exe</OutputFile>
> -
> <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> +
> <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> <GenerateDebugInformation>true</GenerateDebugInformation>
> <TargetMachine>MachineX86</TargetMachine>
> <ImageHasSafeExceptionHandlers>
> @@ -82,7 +82,7 @@
> <ClCompile>
> <Optimization>Full</Optimization>
> <IntrinsicFunctions>true</IntrinsicFunctions>
> -
> <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../../bzip2;../../../xz/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>
> <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
> <FunctionLevelLinking>true</FunctionLevelLinking>
> @@ -93,9 +93,9 @@
> <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
> </ClCompile>
> <Link>
> -
> <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
> +
> <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;libbz2.lib;liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies>
> <OutputFile>Release\$(ProjectName).exe</OutputFile>
> -
> <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> +
> <AdditionalLibraryDirectories>../../../icu-sword/lib;../../../bzip2/Release;../../../xz/bin_i486;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> <GenerateDebugInformation>true</GenerateDebugInformation>
> <OptimizeReferences>true</OptimizeReferences>
> <EnableCOMDATFolding>true</EnableCOMDATFolding>
>
>
> _______________________________________________
> sword-cvs mailing list
> sword-cvs at crosswire.org
> http://www.crosswire.org/mailman/listinfo/sword-cvs
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.crosswire.org/pipermail/sword-cvs/attachments/20140304/b8de8f61/attachment-0001.html>
More information about the sword-cvs
mailing list