microsoft
/
libHttpClient
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fixing props for win32 (#209)

This commit is contained in:
Jason Sandlin 2018-07-25 10:23:47 -07:00 коммит произвёл GitHub
Родитель b0120bf87f
Коммит b5e41891fe
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 23 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
Samples/Win32-Http/Win32Http.vcxproj
Просмотреть файл

@ -101,7 +101,6 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>winhttp.lib;$(libHttpClientLibName);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep>
<Command>copy $(MSBuildProjectDirectory)\..\..\Binaries\Debug\x64\libHttpClient.140.Win32.C\libHttpClient.140.Win32.C.dll $(OutputPath)
@ -122,7 +121,6 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>winhttp.lib;$(libHttpClientLibName);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -140,7 +138,6 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>$(libHttpClientLibName);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -158,7 +155,6 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>$(libHttpClientLibName);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>

6
Samples/Win32-Http/main.cpp
Просмотреть файл

@ -64,7 +64,7 @@ DWORD g_defaultIdealProcessor = 0;
DWORD g_numActiveThreads = 0;
async_queue_handle_t g_queue;
uint32_t g_callbackToken;
registration_token_t g_callbackToken;
DWORD WINAPI background_thread_proc(LPVOID lpParam)
{
@ -120,7 +120,7 @@ DWORD WINAPI background_thread_proc(LPVOID lpParam)
return 0;
}
void HandleAsyncQueueCallback(
void CALLBACK HandleAsyncQueueCallback(
_In_ void* context,
_In_ async_queue_handle_t queue,
_In_ AsyncQueueCallbackType type
@ -201,7 +201,7 @@ int main()
AsyncQueueDispatchMode::AsyncQueueDispatchMode_Manual,
AsyncQueueDispatchMode::AsyncQueueDispatchMode_Manual,
&g_queue);
AddAsyncQueueCallbackSubmitted(g_queue, nullptr, HandleAsyncQueueCallback, &g_callbackToken);
RegisterAsyncQueueCallbackSubmitted(g_queue, nullptr, HandleAsyncQueueCallback, &g_callbackToken);
StartBackgroundThread();

21
libHttpClient.props
Просмотреть файл

@ -45,7 +45,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup>
<Link>
<AdditionalLibraryDirectories>$(libHttpClientLib3);$(libHttpClientLib2);$(libHttpClientLib)%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(libHttpClientLib3);$(libHttpClientLib2);$(libHttpClientLib);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup>
@ -53,4 +53,23 @@
<AdditionalDependencies>$(libHttpClientLibName);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(libHttpClientDefine)'=='HC_WIN32_API'">
<Link>
<AdditionalDependencies>Crypt32.lib;winhttp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<PropertyGroup Condition="'$(libHttpClientDefine)'=='HC_WIN32_API'">
<BuildRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))</BuildRoot>
<LibHttpPackagesRoot Condition="'$(LibHttpPackagesRoot)'=='' AND Exists('$(BuildRoot)\External\packages')">$(BuildRoot)External\packages\</LibHttpPackagesRoot>
<LibHttpPackagesRoot Condition="'$(LibHttpPackagesRoot)'=='' AND Exists('$(BuildRoot)\..\..\External\Packages')">$(BuildRoot)\..\..External\Packages\</LibHttpPackagesRoot>
</PropertyGroup>
<Import Condition="'$(libHttpClientDefine)'=='HC_WIN32_API'" Project="$(LibHttpPackagesRoot)\zlib.v140.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v140.windesktop.msvcstl.static.rt-dyn.x64.targets" />
<Import Condition="'$(libHttpClientDefine)'=='HC_WIN32_API'" Project="$(LibHttpPackagesRoot)\zlib.v140.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v140.windesktop.msvcstl.static.rt-dyn.x86.targets" />
<Import Condition="'$(libHttpClientDefine)'=='HC_WIN32_API'" Project="$(LibHttpPackagesRoot)\openssl.v140.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v140.windesktop.msvcstl.static.rt-dyn.x86.targets" />
<Import Condition="'$(libHttpClientDefine)'=='HC_WIN32_API'" Project="$(LibHttpPackagesRoot)\openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.targets" />
</Project>