AskDavis/Casinotest
1
0
Fork 0
mirror of https://github.com/AskDavis/Casinotest.git synced 2026-01-01 05:05:57 -08:00
Code Issues Packages Projects Releases Wiki Activity

Linux compilation fix

Browse Source
This commit is contained in:
ajochems
2016-04-19 23:43:21 +00:00
parent 5f30e8002b
commit 8906eb0445
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/leveldb/Makefile
View File

@@ -18,7 +18,7 @@ $(shell CC="$(CC)" CXX="$(CXX)" TARGET_OS="$(TARGET_OS)" \
include build_config.mk include build_config.mk
CFLAGS += -I. -I./include $(PLATFORM_CCFLAGS) $(OPT) CFLAGS += -I. -I./include $(PLATFORM_CCFLAGS) $(OPT)
CXXFLAGS += -I. -I./include $(PLATFORM_CXXFLAGS) $(OPT) CXXFLAGS += -I. -I./include $(PLATFORM_CXXFLAGS) $(OPT) -std=c++14
LDFLAGS += $(PLATFORM_LDFLAGS) LDFLAGS += $(PLATFORM_LDFLAGS)
LIBS += $(PLATFORM_LIBS) LIBS += $(PLATFORM_LIBS)

6
src/makefile.unix
View File

@@ -17,13 +17,13 @@ USE_QRCODE=1
# define libraries # define libraries
BOOST_LIB_PATH=$HOME/deps/boost_1_60_0/stage/lib BOOST_LIB_PATH=$HOME/deps/boost_1_60_0/stage/lib
BDB_LIB_PATH=$HOME/deps/db-4.8.30.NC/build_unix BDB_LIB_PATH=$HOME/deps/db-5.1.29.NC/build_unix
OPENSSL_LIB_PATH=$HOME/deps/openssl-1.0.2g OPENSSL_LIB_PATH=$HOME/deps/openssl-1.0.2g
MINIUPNPC_LIB_PATH=$HOME/deps/miniupnpc-1.9 MINIUPNPC_LIB_PATH=$HOME/deps/miniupnpc-1.9
# define includes # define includes
BOOST_INCLUDE_PATH=$HOME/deps/boost_1_60_0 BOOST_INCLUDE_PATH=$HOME/deps/boost_1_60_0
BDB_INCLUDE_PATH=$HOME/deps/db-4.8.30.NC/build_unix BDB_INCLUDE_PATH=$HOME/deps/db-5.1.29.NC/build_unix
OPENSSL_INCLUDE_PATH=$HOME/deps/openssl-1.0.2g OPENSSL_INCLUDE_PATH=$HOME/deps/openssl-1.0.2g
MINIUPNPC_INCLUDE_PATH=$HOME/deps/miniupnpc-1.9 MINIUPNPC_INCLUDE_PATH=$HOME/deps/miniupnpc-1.9
@@ -119,7 +119,7 @@ DEBUGFLAGS=-g
# CXXFLAGS can be specified on the make command line, so we use xCXXFLAGS that only # CXXFLAGS can be specified on the make command line, so we use xCXXFLAGS that only
# adds some defaults in front. Unfortunately, CXXFLAGS=... $(CXXFLAGS) does not work. # adds some defaults in front. Unfortunately, CXXFLAGS=... $(CXXFLAGS) does not work.
xCXXFLAGS=-O2 -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \ xCXXFLAGS=-O2 -std=c++14 -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \
$(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS) $(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS)
# LDFLAGS can be specified on the make command line, so we use xLDFLAGS that only # LDFLAGS can be specified on the make command line, so we use xLDFLAGS that only

9
src/util.cpp
View File

@@ -995,7 +995,7 @@ static std::string FormatException(std::exception* pex, const char* pszThread)
char pszModule[MAX_PATH] = ""; char pszModule[MAX_PATH] = "";
GetModuleFileNameA(NULL, pszModule, sizeof(pszModule)); GetModuleFileNameA(NULL, pszModule, sizeof(pszModule));
#else #else
const char* pszModule = COIN_NAME; const char* pszModule = COIN_NAME.c_str();
#endif #endif
if (pex) if (pex)
return strprintf( return strprintf(
@@ -1052,7 +1052,8 @@ boost::filesystem::path GetDefaultDataDir()
return pathRet / COIN_NAME_DISPLAY; return pathRet / COIN_NAME_DISPLAY;
#else #else
// Unix // Unix
return pathRet / "."+ COIN_NAME + ""; std::string path = "." + COIN_NAME;
return pathRet / path;
#endif #endif
#endif #endif
} }
@@ -1093,7 +1094,7 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific)
boost::filesystem::path GetConfigFile() boost::filesystem::path GetConfigFile()
{ {
boost::filesystem::path pathConfigFile(GetArg("-conf", ""+ COIN_NAME + ".conf")); boost::filesystem::path pathConfigFile(GetArg("-conf", std::string("")+ COIN_NAME + ".conf"));
if (!pathConfigFile.is_complete()) pathConfigFile = GetDataDir(false) / pathConfigFile; if (!pathConfigFile.is_complete()) pathConfigFile = GetDataDir(false) / pathConfigFile;
return pathConfigFile; return pathConfigFile;
} }
@@ -1127,7 +1128,7 @@ void ReadConfigFile(map<string, string>& mapSettingsRet,
boost::filesystem::path GetPidFile() boost::filesystem::path GetPidFile()
{ {
boost::filesystem::path pathPidFile(GetArg("-pid", ""+ COIN_NAME + "d.pid")); boost::filesystem::path pathPidFile(GetArg("-pid", std::string("")+ COIN_NAME + "d.pid"));
if (!pathPidFile.is_complete()) pathPidFile = GetDataDir() / pathPidFile; if (!pathPidFile.is_complete()) pathPidFile = GetDataDir() / pathPidFile;
return pathPidFile; return pathPidFile;
} }

2
src/walletdb.h
View File

@@ -5,6 +5,8 @@
#ifndef BITCOIN_WALLETDB_H #ifndef BITCOIN_WALLETDB_H
#define BITCOIN_WALLETDB_H #define BITCOIN_WALLETDB_H
#define BOOST_NO_CXX11_SCOPED_ENUMS
#include "db.h" #include "db.h"
#include "base58.h" #include "base58.h"