Skip to content

Commit

Permalink
GH-19: Renamed _build_vcpkg.bat to _install_vcpkg.bat
Browse files Browse the repository at this point in the history
  • Loading branch information
negrutiu committed May 31, 2024
1 parent 61f97a8 commit 4648993
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/nscurl/Makefile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ curl-ca-bundle:

vcpkg-install:
REM ----- vcpkg install -------------------------------------------------------
call ..\..\_build_vcpkg.bat $(_arch) mingw static
call ..\..\_install_vcpkg.bat $(_arch) mingw static

# Link
$(_BIN): $(_OBJ)
Expand Down
8 changes: 4 additions & 4 deletions src/nscurl/NScurl.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<AdditionalDependencies>version.lib;libcurl-d.lib;libcrypto.lib;libssl.lib;nghttp2.lib;zlibd.lib;zstd.lib;brotlicommon.lib;brotlidec.lib;ws2_32.lib;Wldap32.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
<Command>call _acquire_pluginapi.bat &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call "$(SolutionDir)_build_vcpkg.bat" $(Platform) msbuild static
<Command>call _acquire_pluginapi.bat &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call "$(SolutionDir)_install_vcpkg.bat" $(Platform) msbuild static
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
Expand All @@ -105,7 +105,7 @@
<AdditionalDependencies>version.lib;libcurl-d.lib;libcrypto.lib;libssl.lib;nghttp2.lib;zlibd.lib;zstd.lib;brotlicommon.lib;brotlidec.lib;ws2_32.lib;Wldap32.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
<Command>call _acquire_pluginapi.bat &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call "$(SolutionDir)_build_vcpkg.bat" $(Platform) msbuild static
<Command>call _acquire_pluginapi.bat &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call "$(SolutionDir)_install_vcpkg.bat" $(Platform) msbuild static
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
Expand All @@ -125,7 +125,7 @@
<AdditionalDependencies>version.lib;libcurl.lib;libcrypto.lib;libssl.lib;nghttp2.lib;zlib.lib;zstd.lib;brotlicommon.lib;brotlidec.lib;ws2_32.lib;Wldap32.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
<Command>call _acquire_pluginapi.bat &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call "$(SolutionDir)_build_vcpkg.bat" $(Platform) msbuild static
<Command>call _acquire_pluginapi.bat &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call "$(SolutionDir)_install_vcpkg.bat" $(Platform) msbuild static
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
Expand All @@ -144,7 +144,7 @@
<AdditionalDependencies>version.lib;libcurl.lib;libcrypto.lib;libssl.lib;nghttp2.lib;zlib.lib;zstd.lib;brotlicommon.lib;brotlidec.lib;ws2_32.lib;Wldap32.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
<Command>call _acquire_pluginapi.bat &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call "$(SolutionDir)_build_vcpkg.bat" $(Platform) msbuild static
<Command>call _acquire_pluginapi.bat &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call "$(SolutionDir)_install_vcpkg.bat" $(Platform) msbuild static
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
Expand Down

0 comments on commit 4648993

Please sign in to comment.