MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Silence some warnings from GCC 10 

Specifically `gcc (Ubuntu 10.2.0-13ubuntu1) 10.2.0`
develop
lethosor 2020-12-30 00:04:49 -05:00
parent b89fe222c7
commit a7232499ac
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
depends/CMakeLists.txt
Unescape Escape View File

@ -12,6 +12,9 @@ add_subdirectory(tthread)
option(JSONCPP_WITH_TESTS "Compile and (for jsoncpp_check) run JsonCpp test executables" OFF) option(JSONCPP_WITH_TESTS "Compile and (for jsoncpp_check) run JsonCpp test executables" OFF)
option(JSONCPP_WITH_POST_BUILD_UNITTEST "Automatically run unit-tests as a post build step" OFF) option(JSONCPP_WITH_POST_BUILD_UNITTEST "Automatically run unit-tests as a post build step" OFF)
add_subdirectory(jsoncpp-sub EXCLUDE_FROM_ALL) add_subdirectory(jsoncpp-sub EXCLUDE_FROM_ALL)
if(UNIX)
set_target_properties(jsoncpp_lib_static PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")
endif()
# build clsocket static and only as a dependency. Setting those options here overrides its own default settings. # build clsocket static and only as a dependency. Setting those options here overrides its own default settings.
option(CLSOCKET_SHARED "Build clsocket lib as shared." OFF) option(CLSOCKET_SHARED "Build clsocket lib as shared." OFF)
option(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependency." ON) option(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependency." ON)

2
depends/libzip

@ -1 +1 @@
Subproject commit be76fa5086bfe6b1a5e83c9855e39f98edc1f066 Subproject commit da0d18ae59ef2699013316b703cdc93809414c93

1
depends/lua/CMakeLists.txt
Unescape Escape View File

@ -100,6 +100,7 @@ if(MSVC)
target_compile_options(lua PRIVATE "/FIdfhack_llimits.h") target_compile_options(lua PRIVATE "/FIdfhack_llimits.h")
else() else()
target_compile_options(lua PRIVATE -include dfhack_llimits.h) target_compile_options(lua PRIVATE -include dfhack_llimits.h)
set_source_files_properties(src/lstring.c PROPERTIES COMPILE_FLAGS "-Wno-stringop-overflow")
endif() endif()
install(TARGETS lua install(TARGETS lua

2
plugins/remotefortressreader/remotefortressreader.cpp
Unescape Escape View File

@ -1081,7 +1081,7 @@ void CopyDesignation(df::map_block * DfBlock, RemoteFortressReader::MapBlock * N
if (gamemode && (*gamemode == game_mode::ADVENTURE)) if (gamemode && (*gamemode == game_mode::ADVENTURE))
{ {
auto fog_of_war = DfBlock->fog_of_war[xx][yy]; auto fog_of_war = DfBlock->fog_of_war[xx][yy];
NetBlock->add_hidden(designation.bits.dig == TileDigDesignation::NO_DIG || designation.bits.hidden); NetBlock->add_hidden((TileDigDesignation)designation.bits.dig == TileDigDesignation::NO_DIG || designation.bits.hidden);
NetBlock->add_tile_dig_designation(TileDigDesignation::NO_DIG); NetBlock->add_tile_dig_designation(TileDigDesignation::NO_DIG);
NetBlock->add_tile_dig_designation_marker(false); NetBlock->add_tile_dig_designation_marker(false);
NetBlock->add_tile_dig_designation_auto(false); NetBlock->add_tile_dig_designation_auto(false);