diff options
33 files changed, 79 insertions, 82 deletions
@@ -45,6 +45,7 @@ doc/html *.opt Debug Release +*.db *.user *.suo *.sdf diff --git a/libusb/os/windows_usbdk.c b/libusb/os/windows_usbdk.c index f65052e..aa48ce2 100644 --- a/libusb/os/windows_usbdk.c +++ b/libusb/os/windows_usbdk.c @@ -157,29 +157,65 @@ error_unload: return LIBUSB_ERROR_NOT_FOUND; } +typedef SC_HANDLE (WINAPI *POPENSCMANAGERA)(LPCSTR, LPCSTR, DWORD); +typedef SC_HANDLE (WINAPI *POPENSERVICEA)(SC_HANDLE, LPCSTR, DWORD); +typedef BOOL (WINAPI *PCLOSESERVICEHANDLE)(SC_HANDLE); + static int usbdk_init(struct libusb_context *ctx) { + POPENSCMANAGERA pOpenSCManagerA; + POPENSERVICEA pOpenServiceA; + PCLOSESERVICEHANDLE pCloseServiceHandle; SC_HANDLE managerHandle; SC_HANDLE serviceHandle; + HMODULE h; + + h = LoadLibraryA("Advapi32"); + if (h == NULL) { + usbi_warn(ctx, "failed to open Advapi32\n"); + return LIBUSB_ERROR_OTHER; + } + + pOpenSCManagerA = (POPENSCMANAGERA)GetProcAddress(h, "OpenSCManagerA"); + if (pOpenSCManagerA == NULL) { + usbi_warn(ctx, "failed to find %s in Advapi32\n", "OpenSCManagerA"); + goto error_free_library; + } + pOpenServiceA = (POPENSERVICEA)GetProcAddress(h, "OpenServiceA"); + if (pOpenServiceA == NULL) { + usbi_warn(ctx, "failed to find %s in Advapi32\n", "OpenServiceA"); + goto error_free_library; + } + pCloseServiceHandle = (PCLOSESERVICEHANDLE)GetProcAddress(h, "CloseServiceHandle"); + if (pCloseServiceHandle == NULL) { + usbi_warn(ctx, "failed to find %s in Advapi32\n", "CloseServiceHandle"); + goto error_free_library; + } - managerHandle = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); + managerHandle = pOpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); if (managerHandle == NULL) { usbi_warn(ctx, "failed to open service control manager: %s", windows_error_str(0)); - return LIBUSB_ERROR_OTHER; + goto error_free_library; } - serviceHandle = OpenServiceA(managerHandle, "UsbDk", GENERIC_READ); - CloseServiceHandle(managerHandle); + serviceHandle = pOpenServiceA(managerHandle, "UsbDk", GENERIC_READ); + pCloseServiceHandle(managerHandle); if (serviceHandle == NULL) { if (GetLastError() != ERROR_SERVICE_DOES_NOT_EXIST) usbi_warn(ctx, "failed to open UsbDk service: %s", windows_error_str(0)); + FreeLibrary(h); return LIBUSB_ERROR_NOT_FOUND; } - CloseServiceHandle(serviceHandle); + pCloseServiceHandle(serviceHandle); + FreeLibrary(h); return load_usbdk_helper_dll(ctx); + +error_free_library: + FreeLibrary(h); + return LIBUSB_ERROR_OTHER; } static void usbdk_exit(struct libusb_context *ctx) diff --git a/libusb/version_nano.h b/libusb/version_nano.h index aed0d3a..5e7ba8f 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11429 +#define LIBUSB_NANO 11430 diff --git a/msvc/fxload_2013.vcxproj b/msvc/fxload_2013.vcxproj index c05e9b8..ef3baaa 100644 --- a/msvc/fxload_2013.vcxproj +++ b/msvc/fxload_2013.vcxproj @@ -45,7 +45,6 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> <AdditionalIncludeDirectories>.;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>__GNU_LIBRARY__;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> @@ -63,6 +62,7 @@ <Link> <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> + <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Link Condition="'$(Configuration)'=='Debug'"> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/msvc/fxload_2015.vcxproj b/msvc/fxload_2015.vcxproj index a5fddfc..807bbd9 100644 --- a/msvc/fxload_2015.vcxproj +++ b/msvc/fxload_2015.vcxproj @@ -52,7 +52,6 @@ </ClCompile> <ClCompile Condition="'$(Configuration)'=='Debug'"> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MinimalRebuild>true</MinimalRebuild> <Optimization>Disabled</Optimization> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> @@ -63,6 +62,7 @@ <Link> <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> + <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Link Condition="'$(Configuration)'=='Debug'"> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/msvc/fxload_2017.vcxproj b/msvc/fxload_2017.vcxproj index e4e74ab..78b3a73 100644 --- a/msvc/fxload_2017.vcxproj +++ b/msvc/fxload_2017.vcxproj @@ -39,9 +39,9 @@ <ProjectGuid>{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}</ProjectGuid> <RootNamespace>examples</RootNamespace> <Keyword>Win32Proj</Keyword> - <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport> <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support> + <WindowsTargetPlatformVersion Condition="'$(Platform)'=='ARM' Or '$(Platform)'=='ARM64'">10.0.17763.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration"> @@ -71,7 +71,6 @@ </ClCompile> <ClCompile Condition="'$(Configuration)'=='Debug'"> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MinimalRebuild>true</MinimalRebuild> <Optimization>Disabled</Optimization> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> @@ -82,13 +81,10 @@ <Link> <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">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)</AdditionalDependencies> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">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)</AdditionalDependencies> + <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Link Condition="'$(Configuration)'=='Debug'"> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">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)</AdditionalDependencies> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">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)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/msvc/getopt_2013.vcxproj b/msvc/getopt_2013.vcxproj index 3b3b8e9..338454e 100644 --- a/msvc/getopt_2013.vcxproj +++ b/msvc/getopt_2013.vcxproj @@ -44,7 +44,6 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>HAVE_STRING_H;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> diff --git a/msvc/getopt_2017.vcxproj b/msvc/getopt_2017.vcxproj index 3d62696..5499849 100644 --- a/msvc/getopt_2017.vcxproj +++ b/msvc/getopt_2017.vcxproj @@ -38,9 +38,9 @@ <ProjectName>getopt</ProjectName> <ProjectGuid>{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}</ProjectGuid> <RootNamespace>getopt</RootNamespace> - <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport> <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support> + <WindowsTargetPlatformVersion Condition="'$(Platform)'=='ARM' Or '$(Platform)'=='ARM64'">10.0.17763.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration"> @@ -78,12 +78,6 @@ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> </ClCompile> - <Lib> - <TargetMachine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MachineX86</TargetMachine> - </Lib> - <Lib> - <TargetMachine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MachineX86</TargetMachine> - </Lib> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\examples\getopt\getopt.c" /> diff --git a/msvc/getopt_sources b/msvc/getopt_sources index 62e0d94..516cb27 100644 --- a/msvc/getopt_sources +++ b/msvc/getopt_sources @@ -17,8 +17,7 @@ USE_MSVCRT=1 INCLUDES=$(DDK_INC_PATH) C_DEFINES=$(C_DEFINES) /DDDKBUILD /DHAVE_STRING_H -TARGETLIBS=$(SDK_LIB_PATH)\kernel32.lib \ - $(SDK_LIB_PATH)\user32.lib +TARGETLIBS=$(SDK_LIB_PATH)\kernel32.lib SOURCES=..\getopt1.c \ ..\getopt.c
\ No newline at end of file diff --git a/msvc/hotplugtest_2013.vcxproj b/msvc/hotplugtest_2013.vcxproj index 0a759d1..915392c 100644 --- a/msvc/hotplugtest_2013.vcxproj +++ b/msvc/hotplugtest_2013.vcxproj @@ -45,7 +45,6 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> @@ -63,6 +62,7 @@ <Link> <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> + <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Link Condition="'$(Configuration)'=='Debug'"> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/msvc/hotplugtest_2015.vcxproj b/msvc/hotplugtest_2015.vcxproj index c9a31b5..2b39f6e 100644 --- a/msvc/hotplugtest_2015.vcxproj +++ b/msvc/hotplugtest_2015.vcxproj @@ -52,7 +52,6 @@ </ClCompile> <ClCompile Condition="'$(Configuration)'=='Debug'"> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MinimalRebuild>true</MinimalRebuild> <Optimization>Disabled</Optimization> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> @@ -63,6 +62,7 @@ <Link> <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> + <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Link Condition="'$(Configuration)'=='Debug'"> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/msvc/hotplugtest_2017.vcxproj b/msvc/hotplugtest_2017.vcxproj index 93061db..2c48c78 100644 --- a/msvc/hotplugtest_2017.vcxproj +++ b/msvc/hotplugtest_2017.vcxproj @@ -39,9 +39,9 @@ <ProjectGuid>{99D2AC64-DC66-4422-91CE-6715C403C9E5}</ProjectGuid> <RootNamespace>examples</RootNamespace> <Keyword>Win32Proj</Keyword> - <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport> <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support> + <WindowsTargetPlatformVersion Condition="'$(Platform)'=='ARM' Or '$(Platform)'=='ARM64'">10.0.17763.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration"> @@ -71,7 +71,6 @@ </ClCompile> <ClCompile Condition="'$(Configuration)'=='Debug'"> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MinimalRebuild>true</MinimalRebuild> <Optimization>Disabled</Optimization> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> @@ -82,13 +81,10 @@ <Link> <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">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)</AdditionalDependencies> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">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)</AdditionalDependencies> + <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Link Condition="'$(Configuration)'=='Debug'"> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">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)</AdditionalDependencies> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">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)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/msvc/libusb_2013.sln b/msvc/libusb_2013.sln index 888cb6e..0b4e9f1 100644 --- a/msvc/libusb_2013.sln +++ b/msvc/libusb_2013.sln @@ -104,4 +104,4 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection -EndGlobal
\ No newline at end of file +EndGlobal diff --git a/msvc/libusb_2015.sln b/msvc/libusb_2015.sln index b4f3b2b..426e95d 100644 --- a/msvc/libusb_2015.sln +++ b/msvc/libusb_2015.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fxload", "fxload_2015.vcxproj", "{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}" EndProject @@ -104,4 +104,4 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection -EndGlobal
\ No newline at end of file +EndGlobal diff --git a/msvc/libusb_2017.sln b/msvc/libusb_2017.sln index 6f53917..63d91d5 100644 --- a/msvc/libusb_2017.sln +++ b/msvc/libusb_2017.sln @@ -183,4 +183,4 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AD8203A3-88DD-4212-A273-100DFAD69F6B} EndGlobalSection -EndGlobal
\ No newline at end of file +EndGlobal diff --git a/msvc/libusb_dll_2013.vcxproj b/msvc/libusb_dll_2013.vcxproj index f175f26..2526945 100644 --- a/msvc/libusb_dll_2013.vcxproj +++ b/msvc/libusb_dll_2013.vcxproj @@ -45,7 +45,6 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WINVER=0x0501;_WIN32_WINNT=0x0501;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level4</WarningLevel> @@ -62,6 +61,7 @@ <Link> <EmbedManagedResourceFile>libusb-1.0.rc;%(EmbedManagedResourceFile)</EmbedManagedResourceFile> <ModuleDefinitionFile>..\libusb\libusb-1.0.def</ModuleDefinitionFile> + <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Link Condition="'$(Configuration)'=='Debug'"> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/msvc/libusb_dll_2015.vcxproj b/msvc/libusb_dll_2015.vcxproj index 0633eac..b89f7d4 100644 --- a/msvc/libusb_dll_2015.vcxproj +++ b/msvc/libusb_dll_2015.vcxproj @@ -62,6 +62,7 @@ <Link> <EmbedManagedResourceFile>libusb-1.0.rc;%(EmbedManagedResourceFile)</EmbedManagedResourceFile> <ModuleDefinitionFile>..\libusb\libusb-1.0.def</ModuleDefinitionFile> + <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Link Condition="'$(Configuration)'=='Debug'"> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/msvc/libusb_dll_2017.vcxproj b/msvc/libusb_dll_2017.vcxproj index 96bc137..63767cd 100644 --- a/msvc/libusb_dll_2017.vcxproj +++ b/msvc/libusb_dll_2017.vcxproj @@ -38,9 +38,9 @@ <ProjectName>libusb-1.0 (dll)</ProjectName> <ProjectGuid>{349EE8FA-7D25-4909-AAF5-FF3FADE72187}</ProjectGuid> <RootNamespace>libusbdll</RootNamespace> - <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport> <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support> + <WindowsTargetPlatformVersion Condition="'$(Platform)'=='ARM' Or '$(Platform)'=='ARM64'">10.0.17763.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration"> @@ -81,17 +81,10 @@ <Link> <EmbedManagedResourceFile>libusb-1.0.rc;%(EmbedManagedResourceFile)</EmbedManagedResourceFile> <ModuleDefinitionFile>..\libusb\libusb-1.0.def</ModuleDefinitionFile> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">kernel32.lib;user32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">kernel32.lib;user32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">kernel32.lib;user32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">kernel32.lib;user32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Link Condition="'$(Configuration)'=='Debug'"> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">kernel32.lib;user32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">kernel32.lib;user32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">kernel32.lib;user32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">kernel32.lib;user32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/msvc/libusb_sources b/msvc/libusb_sources index 76a4e01..f552422 100644 --- a/msvc/libusb_sources +++ b/msvc/libusb_sources @@ -26,8 +26,7 @@ C_DEFINES=$(C_DEFINES) $(LIBUSB_DEFINES) /DDDKBUILD # an older compiler than other objects; rebuild old objects and libraries" USER_C_FLAGS=/GL- -TARGETLIBS=$(SDK_LIB_PATH)\advapi32.lib \ - $(SDK_LIB_PATH)\kernel32.lib +TARGETLIBS=$(SDK_LIB_PATH)\kernel32.lib SOURCES=..\core.c \ ..\descriptor.c \ diff --git a/msvc/libusb_static_2013.vcxproj b/msvc/libusb_static_2013.vcxproj index cb83530..d74730a 100644 --- a/msvc/libusb_static_2013.vcxproj +++ b/msvc/libusb_static_2013.vcxproj @@ -45,7 +45,6 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WINVER=0x0501;_WIN32_WINNT=0x0501;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> diff --git a/msvc/libusb_static_2017.vcxproj b/msvc/libusb_static_2017.vcxproj index b93888c..7d157aa 100644 --- a/msvc/libusb_static_2017.vcxproj +++ b/msvc/libusb_static_2017.vcxproj @@ -38,9 +38,9 @@ <ProjectName>libusb-1.0 (static)</ProjectName> <ProjectGuid>{349EE8F9-7D25-4909-AAF5-FF3FADE72187}</ProjectGuid> <RootNamespace>libusb</RootNamespace> - <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport> <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support> + <WindowsTargetPlatformVersion Condition="'$(Platform)'=='ARM' Or '$(Platform)'=='ARM64'">10.0.17763.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration"> diff --git a/msvc/listdevs_2013.vcxproj b/msvc/listdevs_2013.vcxproj index 3c7f3a9..b1c51fd 100644 --- a/msvc/listdevs_2013.vcxproj +++ b/msvc/listdevs_2013.vcxproj @@ -45,7 +45,6 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> @@ -63,6 +62,7 @@ <Link> <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> + <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Link Condition="'$(Configuration)'=='Debug'"> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/msvc/listdevs_2015.vcxproj b/msvc/listdevs_2015.vcxproj index 2393118..110fa5a 100644 --- a/msvc/listdevs_2015.vcxproj +++ b/msvc/listdevs_2015.vcxproj @@ -52,7 +52,6 @@ </ClCompile> <ClCompile Condition="'$(Configuration)'=='Debug'"> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MinimalRebuild>true</MinimalRebuild> <Optimization>Disabled</Optimization> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> @@ -63,6 +62,7 @@ <Link> <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> + <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Link Condition="'$(Configuration)'=='Debug'"> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/msvc/listdevs_2017.vcxproj b/msvc/listdevs_2017.vcxproj index ecc51de..b685238 100644 --- a/msvc/listdevs_2017.vcxproj +++ b/msvc/listdevs_2017.vcxproj @@ -39,9 +39,9 @@ <ProjectGuid>{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}</ProjectGuid> <RootNamespace>examples</RootNamespace> <Keyword>Win32Proj</Keyword> - <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport> <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support> + <WindowsTargetPlatformVersion Condition="'$(Platform)'=='ARM' Or '$(Platform)'=='ARM64'">10.0.17763.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration"> @@ -71,7 +71,6 @@ </ClCompile> <ClCompile Condition="'$(Configuration)'=='Debug'"> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MinimalRebuild>true</MinimalRebuild> <Optimization>Disabled</Optimization> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> @@ -82,13 +81,10 @@ <Link> <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">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)</AdditionalDependencies> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">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)</AdditionalDependencies> + <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Link Condition="'$(Configuration)'=='Debug'"> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">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)</AdditionalDependencies> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">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)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/msvc/stress_2013.vcxproj b/msvc/stress_2013.vcxproj index cde30a8..83c1f16 100644 --- a/msvc/stress_2013.vcxproj +++ b/msvc/stress_2013.vcxproj @@ -45,7 +45,6 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> @@ -63,6 +62,7 @@ <Link> <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> + <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Link Condition="'$(Configuration)'=='Debug'"> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/msvc/stress_2015.vcxproj b/msvc/stress_2015.vcxproj index b30119a..85a2cc3 100644 --- a/msvc/stress_2015.vcxproj +++ b/msvc/stress_2015.vcxproj @@ -52,7 +52,6 @@ </ClCompile> <ClCompile Condition="'$(Configuration)'=='Debug'"> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MinimalRebuild>true</MinimalRebuild> <Optimization>Disabled</Optimization> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> @@ -63,6 +62,7 @@ <Link> <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> + <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Link Condition="'$(Configuration)'=='Debug'"> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/msvc/stress_2017.vcxproj b/msvc/stress_2017.vcxproj index 7df6147..d2dea81 100644 --- a/msvc/stress_2017.vcxproj +++ b/msvc/stress_2017.vcxproj @@ -39,9 +39,9 @@ <ProjectGuid>{53942EFF-C810-458D-B3CB-EE5CE9F1E781}</ProjectGuid> <RootNamespace>tests</RootNamespace> <Keyword>Win32Proj</Keyword> - <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport> <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support> + <WindowsTargetPlatformVersion Condition="'$(Platform)'=='ARM' Or '$(Platform)'=='ARM64'">10.0.17763.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration"> @@ -71,7 +71,6 @@ </ClCompile> <ClCompile Condition="'$(Configuration)'=='Debug'"> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MinimalRebuild>true</MinimalRebuild> <Optimization>Disabled</Optimization> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> @@ -82,13 +81,10 @@ <Link> <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">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)</AdditionalDependencies> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">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)</AdditionalDependencies> + <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Link Condition="'$(Configuration)'=='Debug'"> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">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)</AdditionalDependencies> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">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)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/msvc/testlibusb_2013.vcxproj b/msvc/testlibusb_2013.vcxproj index 852e9cd..4c8a107 100644 --- a/msvc/testlibusb_2013.vcxproj +++ b/msvc/testlibusb_2013.vcxproj @@ -45,7 +45,6 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> @@ -63,6 +62,7 @@ <Link> <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> + <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Link Condition="'$(Configuration)'=='Debug'"> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/msvc/testlibusb_2015.vcxproj b/msvc/testlibusb_2015.vcxproj index 759b2a3..609e23a 100644 --- a/msvc/testlibusb_2015.vcxproj +++ b/msvc/testlibusb_2015.vcxproj @@ -52,7 +52,6 @@ </ClCompile> <ClCompile Condition="'$(Configuration)'=='Debug'"> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MinimalRebuild>true</MinimalRebuild> <Optimization>Disabled</Optimization> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> @@ -63,6 +62,7 @@ <Link> <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> + <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Link Condition="'$(Configuration)'=='Debug'"> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/msvc/testlibusb_2017.vcxproj b/msvc/testlibusb_2017.vcxproj index be240d4..67c7c88 100644 --- a/msvc/testlibusb_2017.vcxproj +++ b/msvc/testlibusb_2017.vcxproj @@ -39,9 +39,9 @@ <ProjectGuid>{70828935-325B-4749-B381-0E55EF31AEE8}</ProjectGuid> <RootNamespace>examples</RootNamespace> <Keyword>Win32Proj</Keyword> - <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport> <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support> + <WindowsTargetPlatformVersion Condition="'$(Platform)'=='ARM' Or '$(Platform)'=='ARM64'">10.0.17763.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration"> @@ -71,7 +71,6 @@ </ClCompile> <ClCompile Condition="'$(Configuration)'=='Debug'"> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MinimalRebuild>true</MinimalRebuild> <Optimization>Disabled</Optimization> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> @@ -82,13 +81,10 @@ <Link> <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">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)</AdditionalDependencies> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">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)</AdditionalDependencies> + <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Link Condition="'$(Configuration)'=='Debug'"> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">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)</AdditionalDependencies> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">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)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/msvc/xusb_2013.vcxproj b/msvc/xusb_2013.vcxproj index 07e4d3f..195c73d 100644 --- a/msvc/xusb_2013.vcxproj +++ b/msvc/xusb_2013.vcxproj @@ -45,7 +45,6 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> @@ -63,6 +62,7 @@ <Link> <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> + <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Link Condition="'$(Configuration)'=='Debug'"> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/msvc/xusb_2015.vcxproj b/msvc/xusb_2015.vcxproj index 69459e8..1393007 100644 --- a/msvc/xusb_2015.vcxproj +++ b/msvc/xusb_2015.vcxproj @@ -53,7 +53,6 @@ <ClCompile Condition="'$(Configuration)'=='Debug'"> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> - <MinimalRebuild>true</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> <ClCompile Condition="'$(Configuration)'=='Release'"> @@ -63,6 +62,7 @@ <Link> <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> + <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Link Condition="'$(Configuration)'=='Debug'"> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/msvc/xusb_2017.vcxproj b/msvc/xusb_2017.vcxproj index f03ae6b..7ffb546 100644 --- a/msvc/xusb_2017.vcxproj +++ b/msvc/xusb_2017.vcxproj @@ -39,9 +39,9 @@ <ProjectGuid>{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}</ProjectGuid> <RootNamespace>examples</RootNamespace> <Keyword>Win32Proj</Keyword> - <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport> <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support> + <WindowsTargetPlatformVersion Condition="'$(Platform)'=='ARM' Or '$(Platform)'=='ARM64'">10.0.17763.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Configuration"> @@ -72,7 +72,6 @@ <ClCompile Condition="'$(Configuration)'=='Debug'"> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> - <MinimalRebuild>true</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> <ClCompile Condition="'$(Configuration)'=='Release'"> @@ -82,13 +81,10 @@ <Link> <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">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)</AdditionalDependencies> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">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)</AdditionalDependencies> + <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Link Condition="'$(Configuration)'=='Debug'"> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">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)</AdditionalDependencies> - <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">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)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> |