Skip to content

Commit 55c896f

Browse files
pps83pps83
committed
Fix msvc build, clean up project config
1 parent 06d6aad commit 55c896f

8 files changed

+36
-74
lines changed

‎vs/bitpack_avx2.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
#include "lib\bitpack.c"
1+
#define __AVX2__ 1
2+
#include "../lib/bitpack.c"

‎vs/bitunpack_avx2.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
#include "lib\bitunpack.c"
1+
#define __AVX2__ 1
2+
#include "../lib/bitunpack.c"

‎vs/bitutil_avx2.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#define __AVX2__
2-
#include "lib\bitutil.c"
1+
#define __AVX2__ 1
2+
#include "../lib/bitutil.c"

‎vs/transpose_avx2.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
#include "lib\transpose.c"
1+
#define __AVX2__ 1
2+
#include "../lib/transpose.c"

‎vs/vp4c_avx2.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
#include "lib\vp4c.c"
1+
#define __AVX2__ 1
2+
#include "../lib/vp4c.c"

‎vs/vp4d_avx2.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
#include "lib\vp4d.c"
1+
#define __AVX2__ 1
2+
#include "../lib/vp4d.c"

‎vs/vs2022/TurboPFor.vcxproj

+16-55
Large diffs are not rendered by default.

‎vs/vs2022/icapp.vcxproj

+8-12
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,8 @@
100100
<Optimization>Disabled</Optimization>
101101
<SDLCheck>true</SDLCheck>
102102
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS=;_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
103-
<ConformanceMode>true</ConformanceMode>
104103
<AdditionalOptions Condition="'$(PlatformToolset)'!='ClangCL'">/w24146 /w24133 /w24996</AdditionalOptions>
105-
<AdditionalOptions Condition="'$(PlatformToolset)'=='ClangCL'">-Wno-parentheses -Wno-unused-variable -Wno-incompatible-pointer-types -Wno-implicit-function-declaration -Wno-tautological-constant-out-of-range-compare -Wno-pointer-sign -Wno-unused-label -Wno-unused-function -Wno-logical-op-parentheses -Wno-pointer-type-mismatch -Wno-sometimes-uninitialized</AdditionalOptions>
104+
<AdditionalOptions Condition="'$(PlatformToolset)'=='ClangCL'">-Wno-parentheses -Wno-unused-variable -Wno-unused-but-set-variable -Wno-incompatible-pointer-types -Wno-implicit-function-declaration -Wno-tautological-constant-out-of-range-compare -Wno-pointer-sign -Wno-unused-label -Wno-unused-function -Wno-logical-op-parentheses -Wno-pointer-type-mismatch -Wno-sometimes-uninitialized</AdditionalOptions>
106105
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
107106
<EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
108107
<AdditionalIncludeDirectories>..\..\ext</AdditionalIncludeDirectories>
@@ -117,11 +116,10 @@
117116
<Optimization>Disabled</Optimization>
118117
<SDLCheck>true</SDLCheck>
119118
<PreprocessorDefinitions>CODEC2;_CRT_SECURE_NO_WARNINGS=;_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
120-
<ConformanceMode>true</ConformanceMode>
121119
<AdditionalOptions Condition="'$(PlatformToolset)'!='ClangCL'">/w24146 /w24133 /w24996</AdditionalOptions>
122-
<AdditionalOptions Condition="'$(PlatformToolset)'=='ClangCL'">-Wno-parentheses -Wno-unused-variable -Wno-incompatible-pointer-types -Wno-implicit-function-declaration -Wno-tautological-constant-out-of-range-compare -Wno-pointer-sign -Wno-unused-label -Wno-unused-function -Wno-logical-op-parentheses -Wno-pointer-type-mismatch -Wno-sometimes-uninitialized</AdditionalOptions>
120+
<AdditionalOptions Condition="'$(PlatformToolset)'=='ClangCL'">-Wno-parentheses -Wno-unused-variable -Wno-unused-but-set-variable -Wno-incompatible-pointer-types -Wno-implicit-function-declaration -Wno-tautological-constant-out-of-range-compare -Wno-pointer-sign -Wno-unused-label -Wno-unused-function -Wno-logical-op-parentheses -Wno-pointer-type-mismatch -Wno-sometimes-uninitialized</AdditionalOptions>
123121
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
124-
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
122+
<EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
125123
<AdditionalIncludeDirectories>..\..\ext</AdditionalIncludeDirectories>
126124
</ClCompile>
127125
<Link>
@@ -132,16 +130,15 @@
132130
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
133131
<ClCompile>
134132
<Optimization>MaxSpeed</Optimization>
135-
<FunctionLevelLinking>true</FunctionLevelLinking>
136133
<IntrinsicFunctions>true</IntrinsicFunctions>
137134
<SDLCheck>true</SDLCheck>
138135
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS=;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
139-
<ConformanceMode>true</ConformanceMode>
140136
<AdditionalOptions Condition="'$(PlatformToolset)'!='ClangCL'">/w24146 /w24133 /w24996</AdditionalOptions>
141-
<AdditionalOptions Condition="'$(PlatformToolset)'=='ClangCL'">-Wno-parentheses -Wno-unused-variable -Wno-incompatible-pointer-types -Wno-implicit-function-declaration -Wno-tautological-constant-out-of-range-compare -Wno-pointer-sign -Wno-unused-label -Wno-unused-function -Wno-logical-op-parentheses -Wno-pointer-type-mismatch -Wno-sometimes-uninitialized</AdditionalOptions>
137+
<AdditionalOptions Condition="'$(PlatformToolset)'=='ClangCL'">-Wno-parentheses -Wno-unused-variable -Wno-unused-but-set-variable -Wno-incompatible-pointer-types -Wno-implicit-function-declaration -Wno-tautological-constant-out-of-range-compare -Wno-pointer-sign -Wno-unused-label -Wno-unused-function -Wno-logical-op-parentheses -Wno-pointer-type-mismatch -Wno-sometimes-uninitialized</AdditionalOptions>
142138
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
143139
<EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
144140
<AdditionalIncludeDirectories>..\..\ext</AdditionalIncludeDirectories>
141+
<FunctionLevelLinking>true</FunctionLevelLinking>
145142
</ClCompile>
146143
<Link>
147144
<SubSystem>Console</SubSystem>
@@ -153,16 +150,15 @@
153150
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
154151
<ClCompile>
155152
<Optimization>MaxSpeed</Optimization>
156-
<FunctionLevelLinking>true</FunctionLevelLinking>
157153
<IntrinsicFunctions>true</IntrinsicFunctions>
158154
<SDLCheck>true</SDLCheck>
159155
<PreprocessorDefinitions>CODEC2;_CRT_SECURE_NO_WARNINGS=;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
160-
<ConformanceMode>true</ConformanceMode>
161156
<AdditionalOptions Condition="'$(PlatformToolset)'!='ClangCL'">/w24146 /w24133 /w24996</AdditionalOptions>
162-
<AdditionalOptions Condition="'$(PlatformToolset)'=='ClangCL'">-Wno-parentheses -Wno-unused-variable -Wno-incompatible-pointer-types -Wno-implicit-function-declaration -Wno-tautological-constant-out-of-range-compare -Wno-pointer-sign -Wno-unused-label -Wno-unused-function -Wno-logical-op-parentheses -Wno-pointer-type-mismatch -Wno-sometimes-uninitialized</AdditionalOptions>
157+
<AdditionalOptions Condition="'$(PlatformToolset)'=='ClangCL'">-Wno-parentheses -Wno-unused-variable -Wno-unused-but-set-variable -Wno-incompatible-pointer-types -Wno-implicit-function-declaration -Wno-tautological-constant-out-of-range-compare -Wno-pointer-sign -Wno-unused-label -Wno-unused-function -Wno-logical-op-parentheses -Wno-pointer-type-mismatch -Wno-sometimes-uninitialized</AdditionalOptions>
163158
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
164-
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
159+
<EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
165160
<AdditionalIncludeDirectories>..\..\ext</AdditionalIncludeDirectories>
161+
<FunctionLevelLinking>true</FunctionLevelLinking>
166162
</ClCompile>
167163
<Link>
168164
<SubSystem>Console</SubSystem>

0 commit comments

Comments
 (0)