Skip to content

Commit b416d05

Browse files
manxoristmanxorist
committed
Merged revision(s) 23345, 23434 from trunk/OpenMPT:
[Imp] FLAC: Apply <xiph/flac#822> in order to get some testing exposure for C11 threads in VS2022 builds. ........ [Var] FLAC: Silence false-positive MSVC static analyzer warning. ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.32@23593 56274372-70c3-4bfc-bfc3-4c3a0b034d27
1 parent e3c848f commit b416d05

File tree

22 files changed

+557
-385
lines changed

22 files changed

+557
-385
lines changed

‎build/premake/ext-flac.lua‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
files {
9898
"../../include/flac/include/share/alloc.h",
9999
"../../include/flac/include/share/compat.h",
100+
"../../include/flac/include/share/compat_threads.h",
100101
"../../include/flac/include/share/endswap.h",
101102
"../../include/flac/include/share/macros.h",
102103
"../../include/flac/include/share/private.h",
@@ -111,7 +112,7 @@
111112
buildoptions { "/wd4101", "/wd4244", "/wd4267", "/wd4334" }
112113
filter {}
113114
filter { "action:vs*" }
114-
buildoptions { "/wd6001", "/wd6011", "/wd6031", "/wd6297", "/wd6386", "/wd28182" } -- /analyze
115+
buildoptions { "/wd6001", "/wd6011", "/wd6031", "/wd6297", "/wd6386", "/wd26110", "/wd28182" } -- /analyze
115116
filter {}
116117
defines { "FLAC__HAS_OGG=1" }
117118
links { "ogg" }
@@ -132,6 +133,12 @@
132133
"FLAC__USE_AVX",
133134
}
134135
filter {}
136+
filter { "not configurations:DebugShared" }
137+
-- Debug DLL runtime is missing a DLL when using C11 threads
138+
if _ACTION >= "vs2022" then
139+
defines { "HAVE_C11THREADS" }
140+
end
141+
filter {}
135142

136143
function mpt_use_flac ()
137144
filter {}

‎build/vs2017winxp/ext/flac.vcxproj‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@
302302
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
303303
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
304304
<MultiProcessorCompilation>true</MultiProcessorCompilation>
305-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
305+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
306306
</ClCompile>
307307
<Link>
308308
<SubSystem>Windows</SubSystem>
@@ -321,7 +321,7 @@
321321
<MinimalRebuild>false</MinimalRebuild>
322322
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
323323
<MultiProcessorCompilation>true</MultiProcessorCompilation>
324-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
324+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
325325
</ClCompile>
326326
<Link>
327327
<SubSystem>Windows</SubSystem>
@@ -344,7 +344,7 @@
344344
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
345345
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
346346
<MultiProcessorCompilation>true</MultiProcessorCompilation>
347-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
347+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
348348
</ClCompile>
349349
<Link>
350350
<SubSystem>Windows</SubSystem>
@@ -367,7 +367,7 @@
367367
<StringPooling>true</StringPooling>
368368
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
369369
<MultiProcessorCompilation>true</MultiProcessorCompilation>
370-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
370+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
371371
</ClCompile>
372372
<Link>
373373
<SubSystem>Windows</SubSystem>
@@ -392,7 +392,7 @@
392392
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
393393
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
394394
<MultiProcessorCompilation>true</MultiProcessorCompilation>
395-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
395+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
396396
</ClCompile>
397397
<Link>
398398
<SubSystem>Windows</SubSystem>
@@ -416,7 +416,7 @@
416416
<StringPooling>true</StringPooling>
417417
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
418418
<MultiProcessorCompilation>true</MultiProcessorCompilation>
419-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
419+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
420420
</ClCompile>
421421
<Link>
422422
<SubSystem>Windows</SubSystem>
@@ -437,7 +437,7 @@
437437
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
438438
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
439439
<MultiProcessorCompilation>true</MultiProcessorCompilation>
440-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
440+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
441441
</ClCompile>
442442
<Link>
443443
<SubSystem>Windows</SubSystem>
@@ -457,7 +457,7 @@
457457
<MinimalRebuild>false</MinimalRebuild>
458458
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
459459
<MultiProcessorCompilation>true</MultiProcessorCompilation>
460-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
460+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
461461
</ClCompile>
462462
<Link>
463463
<SubSystem>Windows</SubSystem>
@@ -481,7 +481,7 @@
481481
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
482482
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
483483
<MultiProcessorCompilation>true</MultiProcessorCompilation>
484-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
484+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
485485
</ClCompile>
486486
<Link>
487487
<SubSystem>Windows</SubSystem>
@@ -506,7 +506,7 @@
506506
<StringPooling>true</StringPooling>
507507
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
508508
<MultiProcessorCompilation>true</MultiProcessorCompilation>
509-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
509+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
510510
</ClCompile>
511511
<Link>
512512
<SubSystem>Windows</SubSystem>
@@ -533,7 +533,7 @@
533533
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
534534
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
535535
<MultiProcessorCompilation>true</MultiProcessorCompilation>
536-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
536+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
537537
</ClCompile>
538538
<Link>
539539
<SubSystem>Windows</SubSystem>
@@ -559,7 +559,7 @@
559559
<StringPooling>true</StringPooling>
560560
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
561561
<MultiProcessorCompilation>true</MultiProcessorCompilation>
562-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
562+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
563563
</ClCompile>
564564
<Link>
565565
<SubSystem>Windows</SubSystem>
@@ -582,6 +582,7 @@
582582
<ClInclude Include="..\..\..\include\flac\include\FLAC\stream_encoder.h" />
583583
<ClInclude Include="..\..\..\include\flac\include\share\alloc.h" />
584584
<ClInclude Include="..\..\..\include\flac\include\share\compat.h" />
585+
<ClInclude Include="..\..\..\include\flac\include\share\compat_threads.h" />
585586
<ClInclude Include="..\..\..\include\flac\include\share\endswap.h" />
586587
<ClInclude Include="..\..\..\include\flac\include\share\macros.h" />
587588
<ClInclude Include="..\..\..\include\flac\include\share\private.h" />

‎build/vs2017winxp/ext/flac.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@
6666
<ClInclude Include="..\..\..\include\flac\include\share\compat.h">
6767
<Filter>include\share</Filter>
6868
</ClInclude>
69+
<ClInclude Include="..\..\..\include\flac\include\share\compat_threads.h">
70+
<Filter>include\share</Filter>
71+
</ClInclude>
6972
<ClInclude Include="..\..\..\include\flac\include\share\endswap.h">
7073
<Filter>include\share</Filter>
7174
</ClInclude>

‎build/vs2017winxpansi/ext/flac.vcxproj‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@
302302
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
303303
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
304304
<MultiProcessorCompilation>true</MultiProcessorCompilation>
305-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
305+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
306306
</ClCompile>
307307
<Link>
308308
<SubSystem>Windows</SubSystem>
@@ -321,7 +321,7 @@
321321
<MinimalRebuild>false</MinimalRebuild>
322322
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
323323
<MultiProcessorCompilation>true</MultiProcessorCompilation>
324-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
324+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
325325
</ClCompile>
326326
<Link>
327327
<SubSystem>Windows</SubSystem>
@@ -344,7 +344,7 @@
344344
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
345345
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
346346
<MultiProcessorCompilation>true</MultiProcessorCompilation>
347-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
347+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
348348
</ClCompile>
349349
<Link>
350350
<SubSystem>Windows</SubSystem>
@@ -367,7 +367,7 @@
367367
<StringPooling>true</StringPooling>
368368
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
369369
<MultiProcessorCompilation>true</MultiProcessorCompilation>
370-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
370+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
371371
</ClCompile>
372372
<Link>
373373
<SubSystem>Windows</SubSystem>
@@ -392,7 +392,7 @@
392392
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
393393
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
394394
<MultiProcessorCompilation>true</MultiProcessorCompilation>
395-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
395+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
396396
</ClCompile>
397397
<Link>
398398
<SubSystem>Windows</SubSystem>
@@ -416,7 +416,7 @@
416416
<StringPooling>true</StringPooling>
417417
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
418418
<MultiProcessorCompilation>true</MultiProcessorCompilation>
419-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
419+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
420420
</ClCompile>
421421
<Link>
422422
<SubSystem>Windows</SubSystem>
@@ -437,7 +437,7 @@
437437
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
438438
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
439439
<MultiProcessorCompilation>true</MultiProcessorCompilation>
440-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
440+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
441441
</ClCompile>
442442
<Link>
443443
<SubSystem>Windows</SubSystem>
@@ -457,7 +457,7 @@
457457
<MinimalRebuild>false</MinimalRebuild>
458458
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
459459
<MultiProcessorCompilation>true</MultiProcessorCompilation>
460-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
460+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
461461
</ClCompile>
462462
<Link>
463463
<SubSystem>Windows</SubSystem>
@@ -481,7 +481,7 @@
481481
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
482482
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
483483
<MultiProcessorCompilation>true</MultiProcessorCompilation>
484-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
484+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
485485
</ClCompile>
486486
<Link>
487487
<SubSystem>Windows</SubSystem>
@@ -506,7 +506,7 @@
506506
<StringPooling>true</StringPooling>
507507
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
508508
<MultiProcessorCompilation>true</MultiProcessorCompilation>
509-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
509+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
510510
</ClCompile>
511511
<Link>
512512
<SubSystem>Windows</SubSystem>
@@ -533,7 +533,7 @@
533533
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
534534
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
535535
<MultiProcessorCompilation>true</MultiProcessorCompilation>
536-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
536+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
537537
</ClCompile>
538538
<Link>
539539
<SubSystem>Windows</SubSystem>
@@ -559,7 +559,7 @@
559559
<StringPooling>true</StringPooling>
560560
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
561561
<MultiProcessorCompilation>true</MultiProcessorCompilation>
562-
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd28182 %(AdditionalOptions)</AdditionalOptions>
562+
<AdditionalOptions>/Zc:threadSafeInit- /wd4101 /wd4244 /wd4267 /wd4334 /wd6001 /wd6011 /wd6031 /wd6297 /wd6386 /wd26110 /wd28182 %(AdditionalOptions)</AdditionalOptions>
563563
</ClCompile>
564564
<Link>
565565
<SubSystem>Windows</SubSystem>
@@ -582,6 +582,7 @@
582582
<ClInclude Include="..\..\..\include\flac\include\FLAC\stream_encoder.h" />
583583
<ClInclude Include="..\..\..\include\flac\include\share\alloc.h" />
584584
<ClInclude Include="..\..\..\include\flac\include\share\compat.h" />
585+
<ClInclude Include="..\..\..\include\flac\include\share\compat_threads.h" />
585586
<ClInclude Include="..\..\..\include\flac\include\share\endswap.h" />
586587
<ClInclude Include="..\..\..\include\flac\include\share\macros.h" />
587588
<ClInclude Include="..\..\..\include\flac\include\share\private.h" />

‎build/vs2017winxpansi/ext/flac.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@
6666
<ClInclude Include="..\..\..\include\flac\include\share\compat.h">
6767
<Filter>include\share</Filter>
6868
</ClInclude>
69+
<ClInclude Include="..\..\..\include\flac\include\share\compat_threads.h">
70+
<Filter>include\share</Filter>
71+
</ClInclude>
6972
<ClInclude Include="..\..\..\include\flac\include\share\endswap.h">
7073
<Filter>include\share</Filter>
7174
</ClInclude>

0 commit comments

Comments
 (0)