Skip to content

GitLab

Commit ca6dda73 authored by Evan Hunt's avatar Evan Hunt
Browse files
Options

Merge branch 'fix-windows' into 'master' 

move ws2_32.lib to the end of AdditionalDependencies

See merge request !761
parents f6c08a28 f8d9bd61
Pipeline #4681 failed with stages
        in 9 minutes and 44 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 2 additions and 2 deletions
        bin/tools/win32/arpaname.vcxproj.in
        View file @ ca6dda73
        ......@@ -68,7 +68,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
        <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;%(AdditionalDependencies);ws2_32.lib</AdditionalDependencies>
        </Link>
        </ItemDefinitionGroup>
        <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
        ......
        bin/tools/win32/mdig.vcxproj.in
        View file @ ca6dda73
        ......@@ -68,7 +68,7 @@
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
        <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
        <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;libbind9.lib;%(AdditionalDependencies);ws2_32.lib</AdditionalDependencies>
        </Link>
        </ItemDefinitionGroup>
        <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
        ......
        Markdown is supported
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment