Skip to content

Commit 39b6722

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

8 files changed

+25
-63
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__
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__
2+
#include "lib/bitunpack.c"

‎vs/bitutil_avx2.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#define __AVX2__
2-
#include "lib\bitutil.c"
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__
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__
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__
2+
#include "lib/vp4d.c"

‎vs/vs2022/TurboPFor.vcxproj

+10-49
Original file line numberDiff line numberDiff line change
@@ -143,98 +143,59 @@
143143
</ClCompile>
144144
</ItemDefinitionGroup>
145145
<ItemGroup>
146-
<ClCompile Include="..\..\lib\bitpack.c">
147-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">__SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;__AVX__;_CRT_SECURE_NO_WARNINGS=;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
148-
<ExceptionHandling Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExceptionHandling>
149-
</ClCompile>
146+
<ClCompile Include="..\..\lib\bitpack.c" />
150147
<ClCompile Include="..\..\lib\bitunpack.c" />
151-
<ClCompile Include="..\..\lib\bitutil.c">
152-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">__SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;__AVX__;_CRT_SECURE_NO_WARNINGS=;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
153-
</ClCompile>
148+
<ClCompile Include="..\..\lib\bitutil.c" />
154149
<ClCompile Include="..\..\lib\eliasfano.c" />
155150
<ClCompile Include="..\..\lib\fp.c" />
156151
<ClCompile Include="..\..\lib\iccodec.c" />
157152
<ClCompile Include="..\..\lib\bic.c" />
158-
<ClCompile Include="..\..\lib\transpose.c">
159-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">__SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;__AVX__;CRT_SECURE_NO_WARNINGS=;_CONSOLE;NDEBUG</PreprocessorDefinitions>
160-
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotSet</EnableEnhancedInstructionSet>
161-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">__SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;__AVX__;_CRT_SECURE_NO_WARNINGS=;_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
162-
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AdvancedVectorExtensions</EnableEnhancedInstructionSet>
163-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">__SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;__AVX__;_CRT_SECURE_NO_WARNINGS=;_CONSOLE;NDEBUG</PreprocessorDefinitions>
164-
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AdvancedVectorExtensions</EnableEnhancedInstructionSet>
165-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">__SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;__AVX__;_CRT_SECURE_NO_WARNINGS=;_CONSOLE;_DEBUG</PreprocessorDefinitions>
166-
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Default</BasicRuntimeChecks>
167-
</ClCompile>
168-
<ClCompile Include="..\..\lib\transpose_.c">
169-
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AdvancedVectorExtensions</EnableEnhancedInstructionSet>
170-
</ClCompile>
153+
<ClCompile Include="..\..\lib\transpose.c" />
154+
<ClCompile Include="..\..\lib\transpose_.c" />
171155
<ClCompile Include="..\..\lib\trlec.c" />
172156
<ClCompile Include="..\..\lib\trled.c" />
173-
<ClCompile Include="..\..\lib\v8.c">
174-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">__SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;__AVX__;_CRT_SECURE_NO_WARNINGS=;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
175-
</ClCompile>
176-
<ClCompile Include="..\..\lib\v8pack.c">
177-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">__SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;__AVX__;_CRT_SECURE_NO_WARNINGS=;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
178-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">__SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;__AVX__;_CRT_SECURE_NO_WARNINGS=;_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
179-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">__SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;__AVX__;_CRT_SECURE_NO_WARNINGS=;_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
180-
</ClCompile>
157+
<ClCompile Include="..\..\lib\v8.c" />
158+
<ClCompile Include="..\..\lib\v8pack.c" />
181159
<ClCompile Include="..\..\lib\vbit.c" />
182160
<ClCompile Include="..\..\lib\vint.c" />
183161
<ClCompile Include="..\..\lib\vp4c.c" />
184162
<ClCompile Include="..\..\lib\vp4d.c" />
185163
<ClCompile Include="..\..\lib\vsimple.c" />
186164
<ClCompile Include="..\bitpack_avx2.c">
187165
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
188-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">__AVX2__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
189-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">__AVX2__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
190166
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
191167
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
192168
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
193-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">__AVX2__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
194-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">__AVX2__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
195169
</ClCompile>
196170
<ClCompile Include="..\bitunpack_avx2.c">
197171
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
198-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">__AVX2__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
199-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">__AVX2__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
200172
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
201173
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
202174
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
203-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">__AVX2__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
204-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">__AVX2__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
205175
</ClCompile>
206176
<ClCompile Include="..\bitutil_avx2.c">
207-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">__AVX2__;_CRT_SECURE_NO_WARNINGS=;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
177+
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
178+
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
179+
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
180+
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
208181
</ClCompile>
209182
<ClCompile Include="..\transpose_avx2.c">
210183
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
211-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">__AVX2__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
212-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">__AVX2__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
213184
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
214185
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
215186
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
216-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">__AVX2__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
217-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">__AVX2__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
218187
</ClCompile>
219188
<ClCompile Include="..\vp4c_avx2.c">
220189
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
221-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">__AVX2__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
222-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">__AVX2__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
223190
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
224191
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
225192
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
226-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">__AVX2__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
227-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">__AVX2__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
228193
</ClCompile>
229194
<ClCompile Include="..\vp4d_avx2.c">
230195
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
231-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">__AVX2__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
232-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">__AVX2__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
233196
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
234197
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
235198
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
236-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">__AVX2__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
237-
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">__AVX2__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
238199
</ClCompile>
239200
</ItemGroup>
240201
<ItemGroup>

‎vs/vs2022/icapp.vcxproj

+4-8
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
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>
105104
<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>
106105
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -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>
122120
<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>
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>
141137
<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>
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>
162157
<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>
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)