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

Merge remote-tracking branch 'BenLubar/ubuntu-bionic' into develop

develop
lethosor 2018-03-10 16:57:07 -05:00
parent 0ccc89a5fe 7bbfd456d3
commit d55048dfa1
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
Unescape Escape View File

@ -189,6 +189,7 @@ IF(UNIX)
# ensure compatibility with older CPUs # ensure compatibility with older CPUs
# enable C++11 features # enable C++11 features
add_definitions(-DLINUX_BUILD) add_definitions(-DLINUX_BUILD)
add_definitions(-D_GLIBCXX_USE_C99)
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -Wall -Wno-unused-variable") SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -Wall -Wno-unused-variable")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -mtune=generic -std=c++0x") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -mtune=generic -std=c++0x")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -mtune=generic") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -mtune=generic")

2
depends/jsoncpp/jsoncpp.cpp
Unescape Escape View File

@ -3922,8 +3922,10 @@ Value& Path::make(Value& root) const {
#define isfinite finite #define isfinite finite
#else #else
#include <cmath> #include <cmath>
#ifndef isfinite // fix isfinite on Ubuntu 18.04
#define isfinite std::isfinite #define isfinite std::isfinite
#endif #endif
#endif
#if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below #if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below
#define snprintf _snprintf #define snprintf _snprintf

1
library/MiscUtils.cpp
Unescape Escape View File

@ -36,6 +36,7 @@ distribution.
#include <ctype.h> #include <ctype.h>
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
#include <cstdlib>
#include <sstream> #include <sstream>
#include <map> #include <map>