Skip to content

Commit fd9c20f

Browse files
authored
Merge pull request #22 from Falcosoft/master
Updated project files (VS 2019)
2 parents e947895 + 8e20f39 commit fd9c20f

File tree

4 files changed

+24
-12
lines changed

4 files changed

+24
-12
lines changed

Source/Driver/ASIO2WASAPI.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1180,7 +1180,7 @@ BOOL CALLBACK ASIO2WASAPI::ControlPanelProc(HWND hwndDlg,
11801180

11811181
IMMDeviceEnumerator *pEnumerator = NULL;
11821182
DWORD flags = 0;
1183-
std::ignore = CoInitialize(NULL);
1183+
(void) CoInitialize(NULL);
11841184

11851185
HRESULT hr = CoCreateInstance(
11861186
CLSID_MMDeviceEnumerator, NULL,
@@ -1655,7 +1655,7 @@ ASIOBool ASIO2WASAPI::init(void* sysRef)
16551655
IMMDeviceEnumerator *pEnumerator = NULL;
16561656
DWORD flags = 0;
16571657

1658-
std::ignore = CoInitialize(NULL);
1658+
(void) CoInitialize(NULL);
16591659

16601660
hr = CoCreateInstance(
16611661
CLSID_MMDeviceEnumerator, NULL,

Source/Driver/ASIO2WASAPI.vcxproj

+12-4
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,28 @@
3030
</SccLocalPath>
3131
<SccProvider>
3232
</SccProvider>
33+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
3334
</PropertyGroup>
3435
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3536
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3637
<ConfigurationType>DynamicLibrary</ConfigurationType>
3738
<UseDebugLibraries>true</UseDebugLibraries>
38-
<PlatformToolset>v141</PlatformToolset>
39+
<PlatformToolset>v142</PlatformToolset>
3940
</PropertyGroup>
4041
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4142
<ConfigurationType>DynamicLibrary</ConfigurationType>
4243
<UseDebugLibraries>true</UseDebugLibraries>
43-
<PlatformToolset>v141</PlatformToolset>
44+
<PlatformToolset>v142</PlatformToolset>
4445
</PropertyGroup>
4546
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4647
<ConfigurationType>DynamicLibrary</ConfigurationType>
4748
<UseDebugLibraries>false</UseDebugLibraries>
48-
<PlatformToolset>v141</PlatformToolset>
49+
<PlatformToolset>v142</PlatformToolset>
4950
</PropertyGroup>
5051
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5152
<ConfigurationType>DynamicLibrary</ConfigurationType>
5253
<UseDebugLibraries>false</UseDebugLibraries>
53-
<PlatformToolset>v141</PlatformToolset>
54+
<PlatformToolset>v142</PlatformToolset>
5455
</PropertyGroup>
5556
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5657
<ImportGroup Label="ExtensionSettings">
@@ -139,6 +140,10 @@
139140
<IntrinsicFunctions>true</IntrinsicFunctions>
140141
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
141142
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
143+
<RuntimeTypeInfo>false</RuntimeTypeInfo>
144+
<OpenMPSupport>false</OpenMPSupport>
145+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
146+
<FloatingPointModel>Fast</FloatingPointModel>
142147
</ClCompile>
143148
<Link>
144149
<SubSystem>Windows</SubSystem>
@@ -160,6 +165,9 @@
160165
<IntrinsicFunctions>true</IntrinsicFunctions>
161166
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
162167
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
168+
<RuntimeTypeInfo>false</RuntimeTypeInfo>
169+
<OpenMPSupport>false</OpenMPSupport>
170+
<FloatingPointModel>Fast</FloatingPointModel>
163171
</ClCompile>
164172
<Link>
165173
<SubSystem>Windows</SubSystem>

Source/Install/Install.vcxproj

+5-3
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
</SccLocalPath>
2323
<SccProvider>
2424
</SccProvider>
25-
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2929
<ConfigurationType>Application</ConfigurationType>
3030
<UseDebugLibraries>true</UseDebugLibraries>
31-
<PlatformToolset>v141</PlatformToolset>
31+
<PlatformToolset>v142</PlatformToolset>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3434
<ConfigurationType>Application</ConfigurationType>
3535
<UseDebugLibraries>false</UseDebugLibraries>
36-
<PlatformToolset>v141</PlatformToolset>
36+
<PlatformToolset>v142</PlatformToolset>
3737
</PropertyGroup>
3838
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3939
<ImportGroup Label="ExtensionSettings">
@@ -78,6 +78,8 @@
7878
<IntrinsicFunctions>true</IntrinsicFunctions>
7979
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8080
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
81+
<RuntimeTypeInfo>false</RuntimeTypeInfo>
82+
<OpenMPSupport>false</OpenMPSupport>
8183
</ClCompile>
8284
<Link>
8385
<SubSystem>Windows</SubSystem>

Source/Uninstall/Uninstall.vcxproj

+5-3
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
</SccLocalPath>
2323
<SccProvider>
2424
</SccProvider>
25-
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2929
<ConfigurationType>Application</ConfigurationType>
3030
<UseDebugLibraries>true</UseDebugLibraries>
31-
<PlatformToolset>v141</PlatformToolset>
31+
<PlatformToolset>v142</PlatformToolset>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3434
<ConfigurationType>Application</ConfigurationType>
3535
<UseDebugLibraries>false</UseDebugLibraries>
36-
<PlatformToolset>v141</PlatformToolset>
36+
<PlatformToolset>v142</PlatformToolset>
3737
</PropertyGroup>
3838
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3939
<ImportGroup Label="ExtensionSettings">
@@ -78,6 +78,8 @@
7878
<IntrinsicFunctions>true</IntrinsicFunctions>
7979
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8080
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
81+
<RuntimeTypeInfo>false</RuntimeTypeInfo>
82+
<OpenMPSupport>false</OpenMPSupport>
8183
</ClCompile>
8284
<Link>
8385
<SubSystem>Windows</SubSystem>

0 commit comments

Comments
 (0)