Skip to content

Commit be39be8

Browse files
intorrintorr
committed
Part 2 of replacing memory menager. Delete xrMisc.
1 parent d8eb887 commit be39be8

File tree

19 files changed

+1
-262
lines changed

19 files changed

+1
-262
lines changed

‎src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -472,9 +472,6 @@
472472
<ProjectReference Include="..\..\..\Externals\oalib.vcxproj">
473473
<Project>{61d4856f-fa82-4f02-bb88-909ddfb1fe74}</Project>
474474
</ProjectReference>
475-
<ProjectReference Include="..\..\xrMisc\xrMisc.vcxproj">
476-
<Project>{c964d17a-05a8-4bfa-b0a8-7af5c6b627ec}</Project>
477-
</ProjectReference>
478475
</ItemGroup>
479476
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
480477
<ImportGroup Label="ExtensionTargets">

‎src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -519,9 +519,6 @@
519519
<ProjectReference Include="..\..\..\Externals\oalib.vcxproj">
520520
<Project>{61d4856f-fa82-4f02-bb88-909ddfb1fe74}</Project>
521521
</ProjectReference>
522-
<ProjectReference Include="..\..\xrMisc\xrMisc.vcxproj">
523-
<Project>{c964d17a-05a8-4bfa-b0a8-7af5c6b627ec}</Project>
524-
</ProjectReference>
525522
</ItemGroup>
526523
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
527524
<ImportGroup Label="ExtensionTargets">

‎src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -567,9 +567,6 @@
567567
<ProjectReference Include="..\..\..\Externals\oalib.vcxproj">
568568
<Project>{61d4856f-fa82-4f02-bb88-909ddfb1fe74}</Project>
569569
</ProjectReference>
570-
<ProjectReference Include="..\..\xrMisc\xrMisc.vcxproj">
571-
<Project>{c964d17a-05a8-4bfa-b0a8-7af5c6b627ec}</Project>
572-
</ProjectReference>
573570
</ItemGroup>
574571
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
575572
<ImportGroup Label="ExtensionTargets">

‎src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -578,9 +578,6 @@
578578
<ProjectReference Include="..\..\..\Externals\oalib.vcxproj">
579579
<Project>{61d4856f-fa82-4f02-bb88-909ddfb1fe74}</Project>
580580
</ProjectReference>
581-
<ProjectReference Include="..\..\xrMisc\xrMisc.vcxproj">
582-
<Project>{c964d17a-05a8-4bfa-b0a8-7af5c6b627ec}</Project>
583-
</ProjectReference>
584581
</ItemGroup>
585582
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
586583
<ImportGroup Label="ExtensionTargets">

‎src/editors/xrWeatherEditor/pch.hpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88

99
#pragma once
1010

11-
// Конфликт при использовании встроенного в движок аллокатора
12-
#define NO_XRNEW
13-
1411
#pragma managed(push, off)
1512
#include "Common/Common.hpp"
1613
#include "xrCommon/inlining_macros.h"

‎src/engine.sln‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 15
3-
VisualStudioVersion = 15.0.27130.2010
3+
VisualStudioVersion = 15.0.27130.2026
44
MinimumVisualStudioVersion = 14.0.25420.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}"
66
EndProject
@@ -175,7 +175,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcx
175175
{98D24A3D-7666-4C11-9D6E-B10393CE8CBA} = {98D24A3D-7666-4C11-9D6E-B10393CE8CBA}
176176
{CCCA7859-EB86-493E-9B53-C4235F45B3C5} = {CCCA7859-EB86-493E-9B53-C4235F45B3C5}
177177
{94A1C366-3D19-48E6-8170-4ADC2E70DF97} = {94A1C366-3D19-48E6-8170-4ADC2E70DF97}
178-
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC} = {C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}
179178
{435BAC9A-B225-457D-AB40-C9BD0CC8838C} = {435BAC9A-B225-457D-AB40-C9BD0CC8838C}
180179
{200652A6-043E-4634-8837-87983B3BD5E0} = {200652A6-043E-4634-8837-87983B3BD5E0}
181180
{5535F6B4-7AE6-4B66-8AEA-CC31C14D7AB7} = {5535F6B4-7AE6-4B66-8AEA-CC31C14D7AB7}
@@ -213,8 +212,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "..\Externals\cr
213212
EndProject
214213
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dummy", "dummy\dummy.vcxproj", "{B5A3098C-C768-45FF-8B6C-1F707C0344F0}"
215214
EndProject
216-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrMisc", "xrMisc\xrMisc.vcxproj", "{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}"
217-
EndProject
218215
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrMiscMath", "utils\xrMiscMath\xrMiscMath.vcxproj", "{7885CF3C-EE04-4C67-9467-1FBF9A36B037}"
219216
EndProject
220217
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{49438080-78B8-4056-BDCB-4DACAD652C21}"
@@ -981,18 +978,6 @@ Global
981978
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed|x86.ActiveCfg = Mixed|Win32
982979
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release|x64.ActiveCfg = Release|x64
983980
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release|x86.ActiveCfg = Release|Win32
984-
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug|x64.ActiveCfg = Debug|x64
985-
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug|x64.Build.0 = Debug|x64
986-
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug|x86.ActiveCfg = Debug|Win32
987-
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug|x86.Build.0 = Debug|Win32
988-
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed|x64.ActiveCfg = Mixed|x64
989-
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed|x64.Build.0 = Mixed|x64
990-
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed|x86.ActiveCfg = Mixed|Win32
991-
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed|x86.Build.0 = Mixed|Win32
992-
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release|x64.ActiveCfg = Release|x64
993-
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release|x64.Build.0 = Release|x64
994-
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release|x86.ActiveCfg = Release|Win32
995-
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release|x86.Build.0 = Release|Win32
996981
{7885CF3C-EE04-4C67-9467-1FBF9A36B037}.Debug|x64.ActiveCfg = Debug|x64
997982
{7885CF3C-EE04-4C67-9467-1FBF9A36B037}.Debug|x64.Build.0 = Debug|x64
998983
{7885CF3C-EE04-4C67-9467-1FBF9A36B037}.Debug|x86.ActiveCfg = Debug|Win32
@@ -1174,7 +1159,6 @@ Global
11741159
{848E8AB3-9962-4C04-B813-5690399C8A3E} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
11751160
{61D4856F-FA82-4F02-BB88-909DDFB1FE74} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
11761161
{C39F4B46-6E89-4074-902E-CA57073044D2} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
1177-
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC} = {49438080-78B8-4056-BDCB-4DACAD652C21}
11781162
{7885CF3C-EE04-4C67-9467-1FBF9A36B037} = {49438080-78B8-4056-BDCB-4DACAD652C21}
11791163
{07CF01C0-B887-499D-AD9C-799CB6A9FE64} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
11801164
{DAEF6FB5-4F98-4B34-B049-8828EFEC9250} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}

‎src/xrCore/Memory/XRayAllocator.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#pragma once
2-
#include "memory_allocator_options.h"
32
#include "xalloc.h"
43

54
namespace XRay

‎src/xrCore/Memory/memory_allocator_options.h‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/xrCore/xrCore.vcxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,6 @@
311311
<ClInclude Include="Math\MathUtil.hpp" />
312312
<ClInclude Include="math_constants.h" />
313313
<ClInclude Include="Media\Image.hpp" />
314-
<ClInclude Include="Memory\memory_allocator_options.h" />
315314
<ClInclude Include="Memory\xalloc.h" />
316315
<ClInclude Include="Memory\XRayAllocator.hpp" />
317316
<ClInclude Include="net_utils.h" />
@@ -399,9 +398,6 @@
399398
<ProjectReference Include="$(SolutionDir)utils\xrMiscMath\xrMiscMath.vcxproj">
400399
<Project>{7885cf3c-ee04-4c67-9467-1fbf9a36b037}</Project>
401400
</ProjectReference>
402-
<ProjectReference Include="$(SolutionDir)xrMisc\xrMisc.vcxproj">
403-
<Project>{c964d17a-05a8-4bfa-b0a8-7af5c6b627ec}</Project>
404-
</ProjectReference>
405401
</ItemGroup>
406402
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
407403
<ImportGroup Label="ExtensionTargets">

‎src/xrCore/xrCore.vcxproj.filters‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -674,9 +674,6 @@
674674
<ClInclude Include="Memory\XRayAllocator.hpp">
675675
<Filter>Memory</Filter>
676676
</ClInclude>
677-
<ClInclude Include="Memory\memory_allocator_options.h">
678-
<Filter>Memory</Filter>
679-
</ClInclude>
680677
<ClInclude Include="Threading\ThreadPool.hpp">
681678
<Filter>Threading</Filter>
682679
</ClInclude>

0 commit comments

Comments
 (0)