Skip to content

Commit a0e9867

Browse files
committed
xrGame: Don't build PHNetState.cpp twice, just once in xrPhysics
This reverts commit f1852c8. That workaround is no longer necessary.
1 parent 0de8a60 commit a0e9867

File tree

6 files changed

+3
-7
lines changed

6 files changed

+3
-7
lines changed

src/xrCore/FS.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include "_vector3d.h"
1313
#include "_vector4.h"
1414
#include "_color.h"
15-
#include "xrstring.h"
1615
#include "xrCommon/math_funcs.h"
1716
#include "xrCommon/xr_stack.h"
1817

src/xrCore/net_utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#define _INCDEF_NETUTILS_H_
44
#include <string.h>
55
#include "xrCore/_types.h"
6-
#include "xrCore/_matrix.h"
76
#include "client_id.h"
87
#include "xrCommon/xr_string.h"
98

@@ -14,6 +13,7 @@ template <class T> struct _vector4;
1413
typedef _vector4<float> Fvector4;
1514
class shared_str;
1615

16+
1717
#pragma pack(push, 1)
1818

1919
const u32 NET_PacketSizeLimit = 16 * 1024;

src/xrCore/xrMemory.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#pragma once
22

3-
#include "Common/Common.hpp"
43
#include "_types.h"
54

65
#include <tbb/tbb_allocator.h>

src/xrGame/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UIList
8181
list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UIListWnd.cpp")
8282
list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UIListWnd_script.cpp")
8383
list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UITextBanner.cpp")
84+
list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../xrServerEntities/PHNetState.cpp")
8485

8586
list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./atlas_stalkercs_v1.h")
8687
list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./battleye.h")

src/xrServerEntities/PHNetState.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1+
#include "stdafx.h"
12
#pragma hdrstop
23

34
#include "PHNetState.h"
4-
#include "xrCore/net_utils.h"
5-
#include "xrCore/FS.h"
65

76
//////////////////////////////////////8/////////////////////////////////////////////////////
87

src/xrServerEntities/PHNetState.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
#include "xrCommon/xr_vector.h"
77

88
class NET_Packet;
9-
class IReader;
10-
class IWriter;
119

1210
struct SPHNetState
1311
{

0 commit comments

Comments
 (0)