Skip to content

Commit 010fb16

Browse files
feliwirFighter19
andcommitted
[LINUX][ZH] Fix CRCDiff tool compilation (#620)
Co-authored-by: Patrick Zacharias <[email protected]>
1 parent b89216f commit 010fb16

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

CMakeLists.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,17 @@ include(FetchContent)
4242
if((WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows") AND ${CMAKE_SIZEOF_VOID_P} EQUAL 4)
4343
include(cmake/miles.cmake)
4444
include(cmake/bink.cmake)
45-
if (IS_VS6_BUILD)
46-
include(cmake/stlport.cmake)
47-
else()
48-
add_library(stlport INTERFACE) # Do not use stlport
49-
endif()
5045
include(cmake/dx8.cmake)
5146
include(cmake/dbghelp.cmake)
5247
endif()
5348

49+
# Define a dummy stlport target when not on VC6.
50+
if (IS_VS6_BUILD)
51+
include(cmake/stlport.cmake)
52+
else()
53+
add_library(stlport INTERFACE)
54+
endif()
55+
5456
include(cmake/config.cmake)
5557
include(cmake/gamespy.cmake)
5658
include(cmake/lzhl.cmake)

GeneralsMD/Code/Tools/CRCDiff/CRCDiff.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include <list>
2525
#include <stdlib.h>
2626
#include <stdio.h>
27+
#include <string.h>
2728

2829
//=============================================================================
2930

GeneralsMD/Code/Tools/CRCDiff/KVPair.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "KVPair.h"
2828
#include "debug.h"
2929
#include <stdio.h>
30+
#include <string.h>
3031

3132
std::string intToString(int val)
3233
{

0 commit comments

Comments
 (0)