xrGame: Don't build PHNetState.cpp twice, just once in xrPhysics

This reverts commit f1852c8. That workaround is no longer necessary.
OpenXRay · Oct 7, 2018 · a0e9867 · a0e9867
1 parent 0de8a60
commit a0e9867
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 7 deletions.
diff --git a/src/xrCore/FS.h b/src/xrCore/FS.h
@@ -12,7 +12,6 @@
 #include "_vector3d.h"
 #include "_vector4.h"
 #include "_color.h"
-#include "xrstring.h"
 #include "xrCommon/math_funcs.h"
 #include "xrCommon/xr_stack.h"
 

diff --git a/src/xrCore/net_utils.h b/src/xrCore/net_utils.h
@@ -3,7 +3,6 @@
 #define _INCDEF_NETUTILS_H_
 #include <string.h>
 #include "xrCore/_types.h"
-#include "xrCore/_matrix.h"
 #include "client_id.h"
 #include "xrCommon/xr_string.h"
 
@@ -14,6 +13,7 @@ template <class T> struct _vector4;
 typedef _vector4<float> Fvector4;
 class shared_str;
 
+
 #pragma pack(push, 1)
 
 const u32 NET_PacketSizeLimit = 16 * 1024;

diff --git a/src/xrCore/xrMemory.h b/src/xrCore/xrMemory.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Common/Common.hpp"
 #include "_types.h"
 
 #include <tbb/tbb_allocator.h>

diff --git a/src/xrGame/CMakeLists.txt b/src/xrGame/CMakeLists.txt
@@ -81,6 +81,7 @@ list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UIList
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UIListWnd.cpp")
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UIListWnd_script.cpp")
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UITextBanner.cpp")
+list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../xrServerEntities/PHNetState.cpp")
 
 list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./atlas_stalkercs_v1.h")
 list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./battleye.h")

diff --git a/src/xrServerEntities/PHNetState.cpp b/src/xrServerEntities/PHNetState.cpp
@@ -1,8 +1,7 @@
+#include "stdafx.h"
 #pragma hdrstop
 
 #include "PHNetState.h"
-#include "xrCore/net_utils.h"
-#include "xrCore/FS.h"
 
 //////////////////////////////////////8/////////////////////////////////////////////////////
 

diff --git a/src/xrServerEntities/PHNetState.h b/src/xrServerEntities/PHNetState.h
@@ -6,8 +6,6 @@
 #include "xrCommon/xr_vector.h"
 
 class NET_Packet;
-class IReader;
-class IWriter;
 
 struct SPHNetState
 {