Skip to content

Commit 427a106

Browse files
clayneclayne
committed
Remove embedded per-file options in a few projects
* OpenAL: 4 source files were forcing MaxSpeed. They should instead respect the configuration they use. * xrCPU_Pipe: 1 source file (an SSE specific one with embedded asm) is forcing MaxSpeed and various preprocessor options which appear left over from when the inline assembly was being written/debugged. The config will set the appropriate optimization level. This was noticed because VerifiedDX11 is set to no optimization for debugging purposes but optimization kept being applied to certain files. * xrCore: Remove AssemblerOutput from a few files which appears to be left over from debugging. The .asm file isn't used by anything but humans.
1 parent c742869 commit 427a106

File tree

4 files changed

+7
-70
lines changed

4 files changed

+7
-70
lines changed

‎src/3rd party/openal/OpenAL-Windows/Router/vs2022/Router.vcxproj‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,6 @@
259259
</ItemDefinitionGroup>
260260
<ItemGroup>
261261
<ClCompile Include="..\al.cpp">
262-
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
263-
<Optimization Condition="'$(Configuration)|$(Platform)'=='VerifiedDX11|x64'">MaxSpeed</Optimization>
264-
<Optimization Condition="'$(Configuration)|$(Platform)'=='Verified|x64'">MaxSpeed</Optimization>
265-
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release-AVX|x64'">MaxSpeed</Optimization>
266262
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;ROUTER_EXPORTS</PreprocessorDefinitions>
267263
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='VerifiedDX11|x64'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;ROUTER_EXPORTS</PreprocessorDefinitions>
268264
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Verified|x64'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;ROUTER_EXPORTS</PreprocessorDefinitions>
@@ -277,10 +273,6 @@
277273
</BrowseInformation>
278274
</ClCompile>
279275
<ClCompile Include="..\alc.cpp">
280-
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
281-
<Optimization Condition="'$(Configuration)|$(Platform)'=='VerifiedDX11|x64'">MaxSpeed</Optimization>
282-
<Optimization Condition="'$(Configuration)|$(Platform)'=='Verified|x64'">MaxSpeed</Optimization>
283-
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release-AVX|x64'">MaxSpeed</Optimization>
284276
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;ROUTER_EXPORTS</PreprocessorDefinitions>
285277
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='VerifiedDX11|x64'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;ROUTER_EXPORTS</PreprocessorDefinitions>
286278
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Verified|x64'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;ROUTER_EXPORTS</PreprocessorDefinitions>
@@ -295,10 +287,6 @@
295287
</BrowseInformation>
296288
</ClCompile>
297289
<ClCompile Include="..\alList.cpp">
298-
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
299-
<Optimization Condition="'$(Configuration)|$(Platform)'=='VerifiedDX11|x64'">MaxSpeed</Optimization>
300-
<Optimization Condition="'$(Configuration)|$(Platform)'=='Verified|x64'">MaxSpeed</Optimization>
301-
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release-AVX|x64'">MaxSpeed</Optimization>
302290
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;ROUTER_EXPORTS</PreprocessorDefinitions>
303291
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='VerifiedDX11|x64'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;ROUTER_EXPORTS</PreprocessorDefinitions>
304292
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Verified|x64'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;ROUTER_EXPORTS</PreprocessorDefinitions>
@@ -313,10 +301,6 @@
313301
</BrowseInformation>
314302
</ClCompile>
315303
<ClCompile Include="..\OpenAL32.cpp">
316-
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
317-
<Optimization Condition="'$(Configuration)|$(Platform)'=='VerifiedDX11|x64'">MaxSpeed</Optimization>
318-
<Optimization Condition="'$(Configuration)|$(Platform)'=='Verified|x64'">MaxSpeed</Optimization>
319-
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release-AVX|x64'">MaxSpeed</Optimization>
320304
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;ROUTER_EXPORTS</PreprocessorDefinitions>
321305
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='VerifiedDX11|x64'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;ROUTER_EXPORTS</PreprocessorDefinitions>
322306
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Verified|x64'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;ROUTER_EXPORTS</PreprocessorDefinitions>

‎src/xrCDB/vs2022/xrCDB.vcxproj‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -327,25 +327,10 @@
327327
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-AVX|x64'">Create</PrecompiledHeader>
328328
</ClCompile>
329329
<ClCompile Include="..\xrCDB.cpp" />
330-
<ClCompile Include="..\xrCDB_box.cpp">
331-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AssemblyAndSourceCode</AssemblerOutput>
332-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='VerifiedDX11|x64'">AssemblyAndSourceCode</AssemblerOutput>
333-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Verified|x64'">AssemblyAndSourceCode</AssemblerOutput>
334-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release-AVX|x64'">AssemblyAndSourceCode</AssemblerOutput>
335-
</ClCompile>
330+
<ClCompile Include="..\xrCDB_box.cpp" />
336331
<ClCompile Include="..\xrCDB_Collector.cpp" />
337-
<ClCompile Include="..\xrCDB_frustum.cpp">
338-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AssemblyAndSourceCode</AssemblerOutput>
339-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='VerifiedDX11|x64'">AssemblyAndSourceCode</AssemblerOutput>
340-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Verified|x64'">AssemblyAndSourceCode</AssemblerOutput>
341-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release-AVX|x64'">AssemblyAndSourceCode</AssemblerOutput>
342-
</ClCompile>
343-
<ClCompile Include="..\xrCDB_ray.cpp">
344-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AssemblyAndSourceCode</AssemblerOutput>
345-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='VerifiedDX11|x64'">AssemblyAndSourceCode</AssemblerOutput>
346-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Verified|x64'">AssemblyAndSourceCode</AssemblerOutput>
347-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release-AVX|x64'">AssemblyAndSourceCode</AssemblerOutput>
348-
</ClCompile>
332+
<ClCompile Include="..\xrCDB_frustum.cpp" />
333+
<ClCompile Include="..\xrCDB_ray.cpp" />
349334
<ClCompile Include="..\xrXRC.cpp" />
350335
<ClCompile Include="..\xr_area.cpp" />
351336
<ClCompile Include="..\xr_area_query.cpp" />

‎src/xrCPU_Pipe/vs2022/xrCPU_Pipe.vcxproj‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -287,24 +287,7 @@
287287
<ClCompile Include="..\ttapi.cpp" />
288288
<ClCompile Include="..\xrCPU_Pipe.cpp" />
289289
<ClCompile Include="..\xrSkin2W.cpp" />
290-
<ClCompile Include="..\xrSkin2W_SSE.cpp">
291-
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
292-
<Optimization Condition="'$(Configuration)|$(Platform)'=='VerifiedDX11|x64'">MaxSpeed</Optimization>
293-
<Optimization Condition="'$(Configuration)|$(Platform)'=='Verified|x64'">MaxSpeed</Optimization>
294-
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release-AVX|x64'">MaxSpeed</Optimization>
295-
<PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</PreprocessToFile>
296-
<PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='VerifiedDX11|x64'">false</PreprocessToFile>
297-
<PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Verified|x64'">false</PreprocessToFile>
298-
<PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Release-AVX|x64'">false</PreprocessToFile>
299-
<PreprocessSuppressLineNumbers Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</PreprocessSuppressLineNumbers>
300-
<PreprocessSuppressLineNumbers Condition="'$(Configuration)|$(Platform)'=='VerifiedDX11|x64'">false</PreprocessSuppressLineNumbers>
301-
<PreprocessSuppressLineNumbers Condition="'$(Configuration)|$(Platform)'=='Verified|x64'">false</PreprocessSuppressLineNumbers>
302-
<PreprocessSuppressLineNumbers Condition="'$(Configuration)|$(Platform)'=='Release-AVX|x64'">false</PreprocessSuppressLineNumbers>
303-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AssemblyAndSourceCode</AssemblerOutput>
304-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='VerifiedDX11|x64'">AssemblyAndSourceCode</AssemblerOutput>
305-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Verified|x64'">AssemblyAndSourceCode</AssemblerOutput>
306-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release-AVX|x64'">AssemblyAndSourceCode</AssemblerOutput>
307-
</ClCompile>
290+
<ClCompile Include="..\xrSkin2W_SSE.cpp" />
308291
<ClCompile Include="..\xrSkin2W_thread.cpp" />
309292
</ItemGroup>
310293
<ItemGroup>

‎src/xrCore/vs2022/xrCore.vcxproj‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -430,24 +430,9 @@
430430
<ClCompile Include="..\xrMemory_align.cpp" />
431431
<ClCompile Include="..\xrMemory_debug.cpp" />
432432
<ClCompile Include="..\xrMemory_POOL.cpp" />
433-
<ClCompile Include="..\xrMemory_pso_Copy.cpp">
434-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AssemblyAndSourceCode</AssemblerOutput>
435-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='VerifiedDX11|x64'">AssemblyAndSourceCode</AssemblerOutput>
436-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Verified|x64'">AssemblyAndSourceCode</AssemblerOutput>
437-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release-AVX|x64'">AssemblyAndSourceCode</AssemblerOutput>
438-
</ClCompile>
439-
<ClCompile Include="..\xrMemory_pso_Fill.cpp">
440-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AssemblyAndSourceCode</AssemblerOutput>
441-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='VerifiedDX11|x64'">AssemblyAndSourceCode</AssemblerOutput>
442-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Verified|x64'">AssemblyAndSourceCode</AssemblerOutput>
443-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release-AVX|x64'">AssemblyAndSourceCode</AssemblerOutput>
444-
</ClCompile>
445-
<ClCompile Include="..\xrMemory_pso_Fill32.cpp">
446-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AssemblyAndSourceCode</AssemblerOutput>
447-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='VerifiedDX11|x64'">AssemblyAndSourceCode</AssemblerOutput>
448-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Verified|x64'">AssemblyAndSourceCode</AssemblerOutput>
449-
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release-AVX|x64'">AssemblyAndSourceCode</AssemblerOutput>
450-
</ClCompile>
433+
<ClCompile Include="..\xrMemory_pso_Copy.cpp" />
434+
<ClCompile Include="..\xrMemory_pso_Fill.cpp" />
435+
<ClCompile Include="..\xrMemory_pso_Fill32.cpp" />
451436
<ClCompile Include="..\xrMemory_subst_borland.cpp" />
452437
<ClCompile Include="..\xrMemory_subst_msvc.cpp" />
453438
<ClCompile Include="..\xrsharedmem.cpp" />

0 commit comments

Comments
 (0)