From e74d494d1c975b83d1e9ca21caf6c15e51432023 Mon Sep 17 00:00:00 2001 From: Dave Tryon Date: Wed, 31 May 2017 13:13:46 -0700 Subject: [PATCH] Prep build scripts for OACR integration. Also fix an x64 bug that I introduced yesterday (not sure why the build loop didn't catch it) --- Solutions/lib/aria.vcxproj | 40 +++++++++---------- Solutions/net40/net40.vcxproj | 4 +- Solutions/tests/functests/FuncTests.vcxproj | 4 +- Solutions/tests/unittests/UnitTests.vcxproj | 4 +- Solutions/win10-dll/win10-dll.vcxproj | 12 ++++-- Solutions/win32-cpp/Win32.vcxproj | 12 ++++-- Solutions/win32-dll/win32-dll.vcxproj | 10 ++--- Solutions/win32-static/win32-static.vcxproj | 6 ++- build-all.bat | 2 +- .../WindowsDesktopDeviceInformationImpl.cpp | 2 +- 10 files changed, 53 insertions(+), 43 deletions(-) diff --git a/Solutions/lib/aria.vcxproj b/Solutions/lib/aria.vcxproj index 70de6608..b83b9452 100644 --- a/Solutions/lib/aria.vcxproj +++ b/Solutions/lib/aria.vcxproj @@ -80,7 +80,7 @@ - $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) Debug/ EnableFastChecks CompileAsCpp @@ -92,15 +92,15 @@ MultiThreadedDebugDLL true Level4 - ARIASDK_PLATFORM_WINDOWS=1;WIN32;_WINDOWS;_DEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="Aria";CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + ARIASDK_PLATFORM_WINDOWS=1;WIN32;_WINDOWS;_DEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="Aria";CMAKE_INTDIR="Debug";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions) $(IntDir) - ARIASDK_PLATFORM_WINDOWS=1;WIN32;_WINDOWS;_DEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX=\"Aria\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\.;$(ProjectDir)..\..\sysroot\include\sqlite;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) + ARIASDK_PLATFORM_WINDOWS=1;WIN32;_WINDOWS;_DEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX=\"Aria\";CMAKE_INTDIR=\"Debug\";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions) + $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\.;$(ProjectDir)..\..\sysroot\include\sqlite;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) $(ProjectDir)/$(IntDir) %(Filename).h %(Filename).tlb @@ -113,7 +113,7 @@ - $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\.;$(ProjectDir)..\..\sysroot\include\sqlite;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) Release/ CompileAsCpp Sync @@ -123,17 +123,17 @@ MultiThreadedDLL true Level3 - ARIASDK_PLATFORM_WINDOWS=1;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="Aria";CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + ARIASDK_PLATFORM_WINDOWS=1;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="Aria";CMAKE_INTDIR="Release";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions) $(IntDir) - ARIASDK_PLATFORM_WINDOWS=1;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX=\"Aria\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\.;$(ProjectDir)..\..\sysroot\include\sqlite;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) + ARIASDK_PLATFORM_WINDOWS=1;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX=\"Aria\";CMAKE_INTDIR=\"Release\";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions) + $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\.;$(ProjectDir)..\..\sysroot\include\sqlite;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) $(ProjectDir)/$(IntDir) %(Filename).h %(Filename).tlb @@ -146,7 +146,7 @@ - $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\.;$(ProjectDir)..\..\sysroot\include\sqlite;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) Debug/ CompileAsCpp Sync @@ -156,17 +156,17 @@ MultiThreadedDebugDLL true Level3 - ARIASDK_PLATFORM_WINDOWS=1;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="Aria";CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + ARIASDK_PLATFORM_WINDOWS=1;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="Aria";CMAKE_INTDIR="Debug";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions) $(IntDir) - ARIASDK_PLATFORM_WINDOWS=1;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX=\"Aria\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\.;$(ProjectDir)..\..\sysroot\include\sqlite;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) + ARIASDK_PLATFORM_WINDOWS=1;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX=\"Aria\";CMAKE_INTDIR=\"Debug\";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions) + $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\.;$(ProjectDir)..\..\sysroot\include\sqlite;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) $(ProjectDir)/$(IntDir) %(Filename).h %(Filename).tlb @@ -179,7 +179,7 @@ - $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\.;$(ProjectDir)..\..\sysroot\include\sqlite;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) Release/ CompileAsCpp ProgramDatabase @@ -190,15 +190,15 @@ MultiThreadedDLL true Level3 - ARIASDK_PLATFORM_WINDOWS=1;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="Aria";CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + ARIASDK_PLATFORM_WINDOWS=1;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX="Aria";CMAKE_INTDIR="Release";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions) $(IntDir) - ARIASDK_PLATFORM_WINDOWS=1;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX=\"Aria\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\.;$(ProjectDir)..\..\sysroot\include\sqlite;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) + ARIASDK_PLATFORM_WINDOWS=1;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;ARIASDK_VERSION_PREFIX=\"Aria\";CMAKE_INTDIR=\"Release\";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions) + $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\.;$(ProjectDir)..\..\sysroot\include\sqlite;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\sysroot\include;%(AdditionalIncludeDirectories) $(ProjectDir)/$(IntDir) %(Filename).h %(Filename).tlb diff --git a/Solutions/net40/net40.vcxproj b/Solutions/net40/net40.vcxproj index 3cfc08e2..58de22bd 100644 --- a/Solutions/net40/net40.vcxproj +++ b/Solutions/net40/net40.vcxproj @@ -148,7 +148,7 @@ true runtimeobject.lib;z.lib;auf.lib;aux_skype.lib;spl.lib;msxml6.lib;openssl.lib;httpstack.lib;wininet.lib;json.lib;Crypt32.lib;%(AdditionalDependencies) ..\..\..\sysroot\$(QBConfigId)\lib;%(AdditionalLibraryDirectories) - Mfplat.dll;api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll;kernel.appcore.dll;Windows.Networking.Connectivity.dll;Windows.Networking.HostName.dll + api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll;kernel.appcore.dll;Windows.Networking.Connectivity.dll;Windows.Networking.HostName.dll @@ -216,7 +216,7 @@ true runtimeobject.lib;z.lib;auf.lib;aux_skype.lib;spl.lib;msxml6.lib;openssl.lib;httpstack.lib;wininet.lib;json.lib;Crypt32.lib;%(AdditionalDependencies) ..\..\..\sysroot\$(QBConfigId)\lib;%(AdditionalLibraryDirectories) - Mfplat.dll;api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll;kernel.appcore.dll;Windows.Networking.Connectivity.dll;Windows.Networking.HostName.dll + api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll;kernel.appcore.dll;Windows.Networking.Connectivity.dll;Windows.Networking.HostName.dll diff --git a/Solutions/tests/functests/FuncTests.vcxproj b/Solutions/tests/functests/FuncTests.vcxproj index 259d47ca..a522ef67 100644 --- a/Solutions/tests/functests/FuncTests.vcxproj +++ b/Solutions/tests/functests/FuncTests.vcxproj @@ -63,7 +63,7 @@ $(ProjectDir)..\..\out\obj\FuncTests.dir\$(Configuration)\$(Platform)\ FuncTests .exe - true + false true $(ProjectDir)..\..\out\$(Configuration)\$(Platform)\ $(ProjectDir)..\..\out\obj\FuncTests.dir\$(Configuration)\$(Platform)\ @@ -81,7 +81,7 @@ $(ProjectDir)..\..\out\obj\FuncTests.dir\$(Configuration)\$(Platform)\ FuncTests .exe - true + false true diff --git a/Solutions/tests/unittests/UnitTests.vcxproj b/Solutions/tests/unittests/UnitTests.vcxproj index 588ae6dc..21595911 100644 --- a/Solutions/tests/unittests/UnitTests.vcxproj +++ b/Solutions/tests/unittests/UnitTests.vcxproj @@ -61,7 +61,7 @@ $(ProjectDir)..\..\out\obj\UnitTests.dir\$(Configuration)\$(Platform)\ UnitTests .exe - true + false true $(ProjectDir)..\..\out\$(Configuration)\$(Platform)\ $(ProjectDir)..\..\out\obj\UnitTests.dir\$(Configuration)\$(Platform)\ @@ -79,7 +79,7 @@ $(ProjectDir)..\..\out\obj\UnitTests.dir\$(Configuration)\$(Platform)\ UnitTests .exe - true + false true diff --git a/Solutions/win10-dll/win10-dll.vcxproj b/Solutions/win10-dll/win10-dll.vcxproj index 16bcc654..b338205d 100644 --- a/Solutions/win10-dll/win10-dll.vcxproj +++ b/Solutions/win10-dll/win10-dll.vcxproj @@ -149,7 +149,8 @@ false true WindowsApp.lib;$(ProjectDir)..\..\sysroot\lib\$(Configuration)\$(Platform)\z.lib;$(ProjectDir)..\out\$(Configuration)\$(Platform)\sqliteUWP.lib;%(AdditionalDependencies) - Mfplat.dll;psapi.dll + + NCrypt;%(IgnoreSpecificDefaultLibraries) @@ -191,7 +192,8 @@ false true WindowsApp.lib;$(ProjectDir)..\..\sysroot\lib\$(Configuration)\$(Platform)\z.lib;$(ProjectDir)..\out\$(Configuration)\$(Platform)\sqliteUWP.lib;%(AdditionalDependencies) - Mfplat.dll;psapi.dll + + Ole32;NCrypt;%(IgnoreSpecificDefaultLibraries) @@ -211,7 +213,8 @@ false true WindowsApp.lib;$(ProjectDir)..\..\sysroot\lib\$(Configuration)\$(Platform)\z.lib;$(ProjectDir)..\out\$(Configuration)\$(Platform)\sqliteUWP.lib;%(AdditionalDependencies) - Mfplat.dll;psapi.dll + + Ole32;NCrypt;%(IgnoreSpecificDefaultLibraries) true @@ -231,7 +234,8 @@ false true WindowsApp.lib;$(ProjectDir)..\..\sysroot\lib\$(Configuration)\$(Platform)\z.lib;$(ProjectDir)..\out\$(Configuration)\$(Platform)\sqliteUWP.lib;msxml6.lib;%(AdditionalDependencies) - Mfplat.dll;psapi.dll + + NCrypt;%(IgnoreSpecificDefaultLibraries) diff --git a/Solutions/win32-cpp/Win32.vcxproj b/Solutions/win32-cpp/Win32.vcxproj index 1eb71319..66041f09 100644 --- a/Solutions/win32-cpp/Win32.vcxproj +++ b/Solutions/win32-cpp/Win32.vcxproj @@ -111,7 +111,8 @@ true ClientTelemetry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\out\$(Configuration)\$(Platform)\win32-dll\bin;$(UniversalCRTSdkDir)\lib\$(TargetUniversalCRTVersion)\um\x86 - Mfplat.dll + + true @@ -142,7 +143,8 @@ true ClientTelemetry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\out\$(Configuration)\$(Platform)\win32-dll\bin;$(UniversalCRTSdkDir)\lib\$(TargetUniversalCRTVersion)\um\x64 - Mfplat.dll + + true @@ -174,7 +176,8 @@ true ClientTelemetry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\out\$(Configuration)\$(Platform)\win32-dll\bin;$(UniversalCRTSdkDir)\lib\$(TargetUniversalCRTVersion)\um\x86 - Mfplat.dll + + false @@ -205,7 +208,8 @@ true ClientTelemetry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\out\$(Configuration)\$(Platform)\win32-dll\bin;$(UniversalCRTSdkDir)\lib\$(TargetUniversalCRTVersion)\um\x64 - Mfplat.dll + + false diff --git a/Solutions/win32-dll/win32-dll.vcxproj b/Solutions/win32-dll/win32-dll.vcxproj index 6fa208fa..f569c7cf 100644 --- a/Solutions/win32-dll/win32-dll.vcxproj +++ b/Solutions/win32-dll/win32-dll.vcxproj @@ -82,7 +82,7 @@ - true + false ClientTelemetry @@ -131,7 +131,7 @@ Level4 Disabled - ARIASDK_VERSION_PREFIX="Aria";ARIASDK_PLATFORM_WINDOWS;ARIASDK_SHARED_LIB;_ARIA_UTC_SDK;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;WIN32;BOOST_VC14_WORKAROUD;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + ARIASDK_VERSION_PREFIX="Aria";ARIASDK_PLATFORM_WINDOWS;ARIASDK_SHARED_LIB;_ARIA_UTC_SDK;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;WIN32;BOOST_VC14_WORKAROUD;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions) $(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) ProgramDatabase false @@ -155,7 +155,7 @@ true kernel32.lib;ole32.lib;oleaut32.lib;uuid.lib;runtimeobject.lib;$(ProjectDir)..\..\sysroot\lib\$(Configuration)\$(Platform)\z.lib;msxml6.lib;Crypt32.lib;wininet.lib;iphlpapi.lib;rpcrt4.lib;$(ProjectDir)..\out\$(Configuration)\$(Platform)\sqlite.lib;%(AdditionalDependencies) $(SolutionDir)\out\$(Configuration)\$(Platform)\;%(AdditionalLibraryDirectories) - Mfplat.dll;api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll;kernel.appcore.dll;Windows.Networking.Connectivity.dll;Windows.Networking.HostName.dll + api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll @@ -205,7 +205,7 @@ MinSpace true false - ARIASDK_VERSION_PREFIX="Aria";ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_SHARED_LIB=1;_ARIA_UTC_SDK;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;WIN32;BOOST_VC14_WORKAROUD;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + ARIASDK_VERSION_PREFIX="Aria";ARIASDK_PLATFORM_WINDOWS=1;ARIASDK_SHARED_LIB=1;_ARIA_UTC_SDK;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;WIN32;BOOST_VC14_WORKAROUD;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions) $(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\sysroot\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) false false @@ -227,7 +227,7 @@ true uuid.lib;runtimeobject.lib;$(ProjectDir)..\..\sysroot\lib\$(Configuration)\$(Platform)\z.lib;msxml6.lib;wininet.lib;Crypt32.lib;%(AdditionalDependencies) $(SolutionDir)\out\$(Configuration)\$(Platform)\;%(AdditionalLibraryDirectories) - Mfplat.dll;api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll;kernel.appcore.dll;Windows.Networking.Connectivity.dll;Windows.Networking.HostName.dll + api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll diff --git a/Solutions/win32-static/win32-static.vcxproj b/Solutions/win32-static/win32-static.vcxproj index ddbd0cc0..8f829286 100644 --- a/Solutions/win32-static/win32-static.vcxproj +++ b/Solutions/win32-static/win32-static.vcxproj @@ -141,7 +141,8 @@ true z.lib;auf.lib;aux_skype.lib;spl.lib;msxml6.lib;openssl.lib;httpstack.lib;wininet.lib;json.lib;%(AdditionalDependencies) ..\..\..\sysroot\$(QBConfigId)\lib;%(AdditionalLibraryDirectories) - Mfplat.dll + + @@ -215,7 +216,8 @@ true z.lib;auf.lib;aux_skype.lib;spl.lib;msxml6.lib;openssl.lib;httpstack.lib;wininet.lib;json.lib;%(AdditionalDependencies) ..\..\..\sysroot\$(QBConfigId)\lib;%(AdditionalLibraryDirectories) - Mfplat.dll + + diff --git a/build-all.bat b/build-all.bat index 4fb02d03..be37737e 100644 --- a/build-all.bat +++ b/build-all.bat @@ -31,7 +31,7 @@ msbuild Solutions\tests\unittests\UnitTests.vcxproj /maxcpucount:1 /detailedsumm echo *************************************************************************************************** echo *************************************************************************************************** -echo ** Creating Win32 Release ... ** +echo ** Creating Win32 Release ... ** echo *************************************************************************************************** echo *************************************************************************************************** msbuild sqlite\sqlite.vcxproj /maxcpucount:1 /detailedsummary /p:Configuration=release /p:Platform=Win32 diff --git a/lib/pal/win32/WindowsDesktopDeviceInformationImpl.cpp b/lib/pal/win32/WindowsDesktopDeviceInformationImpl.cpp index 2643b9ed..f867e88b 100644 --- a/lib/pal/win32/WindowsDesktopDeviceInformationImpl.cpp +++ b/lib/pal/win32/WindowsDesktopDeviceInformationImpl.cpp @@ -59,7 +59,7 @@ namespace Microsoft { if (pAdapterInfo->AdapterName != NULL) { netIfGuid = _strdup(pAdapterInfo->AdapterName); - _strlwr_s(netIfGuid, lstrlen(netIfGuid) + 1); + _strlwr_s(netIfGuid, lstrlenA(netIfGuid) + 1); } FREE(pAdapterInfo); }