Skip to content

Commit 51772ff

Browse files
author
nitrocaster
committed
Merge branch 'gditeck-crypto' into ai_cleanup
2 parents d9e6913 + 0928ad8 commit 51772ff

27 files changed

+436
-69
lines changed

‎src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -565,10 +565,6 @@
565565
<ClCompile Include="xrRender_R4.cpp" />
566566
</ItemGroup>
567567
<ItemGroup>
568-
<ProjectReference Include="$(SolutionDir)3rd party\crypto\crypto.vcxproj">
569-
<Project>{fa169092-ea3e-40c1-8e5a-a2b575700fe8}</Project>
570-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
571-
</ProjectReference>
572568
<ProjectReference Include="$(SolutionDir)xrCore\xrCore.vcxproj">
573569
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
574570
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>

‎src/engine.sln‎

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.40629.0
2+
# Visual Studio 14
3+
VisualStudioVersion = 14.0.23107.0
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}"
66
EndProject
@@ -109,15 +109,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Maya_Export_2009", "plugins
109109
EndProject
110110
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Maya_Material_2009", "plugins\Maya\Maya_Material2009.vcxproj", "{FFDF27A8-C198-49ED-BA13-4DA9054266C6}"
111111
EndProject
112-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crypto", "3rd party\crypto\crypto.vcxproj", "{FA169092-EA3E-40C1-8E5A-A2B575700FE8}"
113-
EndProject
114112
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrRender_R4", "Layers\xrRenderPC_R4\xrRender_R4.vcxproj", "{AC9B12ED-A2D7-4337-A981-5BD8430E96D8}"
115113
EndProject
116114
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp_screenshots_info", "utils\mp_screenshots_info\mp_screenshots_info.vcxproj", "{032A10AB-E44C-4751-A290-001EF99E664A}"
117115
EndProject
118116
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp_configs_verifyer", "utils\mp_configs_verifyer\mp_configs_verifyer.vcxproj", "{1924EF23-A05E-40E5-93F2-6CCD64BE1F8B}"
119117
EndProject
120-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CxImage", "3rd party\CxImage\cximage.vcxproj", "{880CD250-BA77-4DAF-A8D4-552F12DD3AE4}"
118+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CxImage", "3rd party\cximage\cximage.vcxproj", "{880CD250-BA77-4DAF-A8D4-552F12DD3AE4}"
121119
EndProject
122120
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NVTT", "3rd party\NVTT\NVTT.vcxproj", "{0EB257DC-5CFC-44B0-82C9-CE6B158BE473}"
123121
EndProject
@@ -1040,27 +1038,6 @@ Global
10401038
{FFDF27A8-C198-49ED-BA13-4DA9054266C6}.Release|Mixed Platforms.Build.0 = Release|Win32
10411039
{FFDF27A8-C198-49ED-BA13-4DA9054266C6}.Release|Win32.ActiveCfg = Release|Win32
10421040
{FFDF27A8-C198-49ED-BA13-4DA9054266C6}.Release|Win32.Build.0 = Release|Win32
1043-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
1044-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
1045-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
1046-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
1047-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Debug|Mixed Platforms.Build.0 = Debug|Win32
1048-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Debug|Win32.ActiveCfg = Debug|Win32
1049-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Debug|Win32.Build.0 = Debug|Win32
1050-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
1051-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Mixed_Dedicated|Mixed Platforms.Build.0 = Release|Win32
1052-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Mixed_Dedicated|Win32.ActiveCfg = Debug|Win32
1053-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Mixed|Mixed Platforms.ActiveCfg = Release|Win32
1054-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Mixed|Mixed Platforms.Build.0 = Release|Win32
1055-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Mixed|Win32.ActiveCfg = Debug|Win32
1056-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Mixed|Win32.Build.0 = Debug|Win32
1057-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
1058-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Release_Dedicated|Mixed Platforms.Build.0 = Release|Win32
1059-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
1060-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Release|Mixed Platforms.ActiveCfg = Release|Win32
1061-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Release|Mixed Platforms.Build.0 = Release|Win32
1062-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Release|Win32.ActiveCfg = Release|Win32
1063-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Release|Win32.Build.0 = Release|Win32
10641041
{AC9B12ED-A2D7-4337-A981-5BD8430E96D8}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
10651042
{AC9B12ED-A2D7-4337-A981-5BD8430E96D8}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
10661043
{AC9B12ED-A2D7-4337-A981-5BD8430E96D8}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
@@ -1375,7 +1352,6 @@ Global
13751352
{EC924B9B-4991-4931-8623-E1DB9AE005CA} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
13761353
{E5F40F9E-C01B-4B97-9BD5-FC24308D8022} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
13771354
{FFDF27A8-C198-49ED-BA13-4DA9054266C6} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
1378-
{FA169092-EA3E-40C1-8E5A-A2B575700FE8} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
13791355
{032A10AB-E44C-4751-A290-001EF99E664A} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
13801356
{1924EF23-A05E-40E5-93F2-6CCD64BE1F8B} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
13811357
{880CD250-BA77-4DAF-A8D4-552F12DD3AE4} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}

‎src/utils/mp_configs_verifyer/configs_common.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef CONFIGS_COMMON_INCLUDED
22
#define CONFIGS_COMMON_INCLUDED
33

4-
#include "3rd party/crypto/crypto.h"
4+
#include "xrCore/crypto/crypto.h"
55

66
namespace mp_anticheat
77
{

‎src/utils/mp_configs_verifyer/entry_point.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#include "configs_dump_verifyer.h"
33

44
#pragma comment(lib, "xrCore.lib")
5-
#pragma comment(lib, "crypto.lib")
65

76
static char const * help_msg =
87
"Format: mp_configs_verifyer.exe [--file | --unpack | --io_filter | --help] [file name]\n"

‎src/utils/mp_configs_verifyer/mp_configs_verifyer.vcxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,6 @@
110110
<ClInclude Include="xr_dsa_verifyer.h" />
111111
</ItemGroup>
112112
<ItemGroup>
113-
<ProjectReference Include="$(SolutionDir)3rd party\crypto\crypto.vcxproj">
114-
<Project>{fa169092-ea3e-40c1-8e5a-a2b575700fe8}</Project>
115-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
116-
</ProjectReference>
117113
<ProjectReference Include="$(SolutionDir)xrCore\xrCore.vcxproj">
118114
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
119115
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>

‎src/utils/mp_configs_verifyer/pch.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "xrCore/xrCore.h"
55
#include "xrCore/LocatorAPI.h"
66
#include "xrCore/ppmd_compressor.h"
7-
#include "3rd party/crypto/crypto.h"
7+
#include "xrCore/crypto/crypto.h"
88

99

1010
#include <stdio.h>

‎src/utils/mp_configs_verifyer/xr_dsa_verifyer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef XR_DSA_VERIFYER_INCLUDED
22
#define XR_DSA_VERIFYER_INCLUDED
33

4-
#include "3rd party/crypto/crypto.h"
4+
#include "xrCore/crypto/crypto.h"
55

66
class xr_dsa_verifyer
77
{

‎src/utils/mp_screenshots_info/entry_point.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include "screenshots_reader.h"
44

55
#pragma comment(lib, "xrCore.lib")
6-
#pragma comment(lib, "crypto.lib")
76

87
void print_format()
98
{

‎src/utils/mp_screenshots_info/mp_screenshots_info.vcxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,6 @@
127127
<ClInclude Include="xr_dsa_verifyer.h" />
128128
</ItemGroup>
129129
<ItemGroup>
130-
<ProjectReference Include="$(SolutionDir)3rd party\crypto\crypto.vcxproj">
131-
<Project>{fa169092-ea3e-40c1-8e5a-a2b575700fe8}</Project>
132-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
133-
</ProjectReference>
134130
<ProjectReference Include="$(SolutionDir)xrCore\xrCore.vcxproj">
135131
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
136132
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>

‎src/utils/mp_screenshots_info/pch.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "xrCore/xrCore.h"
55
#include "xrCore/LocatorAPI.h"
6-
#include "3rd party/crypto/crypto.h"
6+
#include "xrCore/crypto/crypto.h"
77

88
#include <stdio.h>
99
#include <conio.h>

0 commit comments

Comments
 (0)