Skip to content

Commit 0cff67b

Browse files
committed
Fix windows debug assert
1 parent 2d1e488 commit 0cff67b

3 files changed

Lines changed: 12 additions & 20 deletions

File tree

src/game/client/CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1795,10 +1795,12 @@ set(UNITY_SOURCE_NEO_WEAPONS
17951795
${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_zr68s.cpp
17961796
)
17971797

1798-
set_source_files_properties(
1799-
${UNITY_SOURCE_NEO_WEAPONS}
1800-
PROPERTIES UNITY_GROUP neo_weapons_client
1801-
)
1798+
if (OS_LINUX) # Windows have CHECK_DECLARE_CLASS to deal with
1799+
set_source_files_properties(
1800+
${UNITY_SOURCE_NEO_WEAPONS}
1801+
PROPERTIES UNITY_GROUP neo_weapons_client
1802+
)
1803+
endif ()
18021804

18031805
target_sources_grouped(
18041806
TARGET client

src/game/server/CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1648,10 +1648,12 @@ set(UNITY_SOURCE_NEO_WEAPONS
16481648
${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_zr68s.cpp
16491649
)
16501650

1651-
set_source_files_properties(
1652-
${UNITY_SOURCE_NEO_WEAPONS}
1653-
PROPERTIES UNITY_GROUP neo_weapons_server
1654-
)
1651+
if (OS_LINUX) # Windows have CHECK_DECLARE_CLASS to deal with
1652+
set_source_files_properties(
1653+
${UNITY_SOURCE_NEO_WEAPONS}
1654+
PROPERTIES UNITY_GROUP neo_weapons_server
1655+
)
1656+
endif ()
16551657

16561658
target_sources_grouped(
16571659
TARGET server

src/public/server_class.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -114,17 +114,6 @@ class CBaseNetworkable;
114114

115115

116116
#ifdef VALIDATE_DECLARE_CLASS
117-
#ifdef NEO // Unity build
118-
#define CHECK_DECLARE_CLASS( DLLClassName, sendTable ) \
119-
template <> int CheckDeclareClass_Access<sendTable::ignored>(sendTable::ignored *, const char *pIgnored) \
120-
{ \
121-
return DLLClassName::CheckDeclareClass( #DLLClassName ); \
122-
} \
123-
namespace sendTable \
124-
{ \
125-
int verifyDeclareClass = CheckDeclareClass_Access( (sendTable::ignored*)0, "" ); \
126-
}
127-
#else
128117
#define CHECK_DECLARE_CLASS( DLLClassName, sendTable ) \
129118
template <typename T> int CheckDeclareClass_Access(T *); \
130119
template <> int CheckDeclareClass_Access<sendTable::ignored>(sendTable::ignored *, const char *pIgnored) \
@@ -135,7 +124,6 @@ class CBaseNetworkable;
135124
{ \
136125
int verifyDeclareClass = CheckDeclareClass_Access( (sendTable::ignored*)0 ); \
137126
}
138-
#endif
139127
#else
140128
#define CHECK_DECLARE_CLASS( DLLClassName, sendTable )
141129
#endif

0 commit comments

Comments
 (0)