Changeset 775


Ignore:
Timestamp:
07/15/09 14:15:21 (10 years ago)
Author:
Eoin
Message:

Latest build with OpenSSL k

Location:
trunk/sln
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sln/HaliteWix/Product.wxs

    r771 r775  
    7878                </Upgrade> 
    7979 
    80                 <Media Id="1" Cabinet="Halite.cab" EmbedCab="yes" /> 
     80                <Media Id="1" Cabinet="Halite.cab" CompressionLevel="high" EmbedCab="yes" /> 
    8181                <WixVariable Id="WixUILicenseRtf" Value="$(var.RootDirectory)LICENSE_1_0.rtf"  /> 
    8282     
     
    349349                <CustomAction Id="PreventDowngrading" Error="A more recent version of Halite is already installed." /> 
    350350                 
    351                 <Condition Message="Uninstall any previous version of Halite first please."> 
     351                <Condition Message="The same version but a different build has been detected. Uninstall it first."> 
    352352                        NOT SAMEVERDIFFBUILDPRODUCTFOUND OR Installed 
    353353                </Condition> 
  • trunk/sln/libtorrent/ClientTest/ClientTest.vcproj

    r707 r775  
    2222                        IntermediateDirectory="$(ConfigurationName)" 
    2323                        ConfigurationType="1" 
    24                         CharacterSet="1" 
     24                        CharacterSet="2" 
    2525                        > 
    2626                        <Tool 
     
    4343                                Optimization="0" 
    4444                                AdditionalIncludeDirectories="&quot;$(SolutionDir)src&quot;;&quot;$(SolutionDir)src\WTLx&quot;;&quot;$(SolutionDir)lib\libtorrent\include&quot;;&quot;$(SolutionDir)lib\libtorrent\zlib&quot;;&quot;$(SolutionDir)lib\Asio\include&quot;;&quot;$(SolutionDir)lib\OpenSSL\inc&quot;;&quot;$(SolutionDir)lib\STLSoft\include&quot;" 
    45                                 PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;__USE_W32_SOCKETS;WIN32;_WIN32;_WINDOWS;_DEBUG;TORRENT_USE_BOOST_DATE_TIME;TORRENT_USE_OPENSSL;TORRENT_LOGGING;TORRENT_VERBOSE_LOGGING;TORRENT_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0" 
     45                                PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;__USE_W32_SOCKETS;WIN32;_WIN32;_WINDOWS;_DEBUG;TORRENT_USE_BOOST_DATE_TIME;TORRENT_USE_OPENSSL;TORRENT_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0" 
    4646                                MinimalRebuild="true" 
    4747                                BasicRuntimeChecks="3" 
Note: See TracChangeset for help on using the changeset viewer.