Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Fix up submodules, add compile fixes

Browse source
This commit is contained in:
Eric Frias 2015-06-10 18:54:12 -04:00
parent 876e9a125d
commit d1e2449290
5 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -1,6 +1,6 @@
[submodule "libraries/fc"] [submodule "libraries/fc"]
path = libraries/fc path = libraries/fc
url = git@github.com:cryptonomex/fc url = git@git.syncad.com:/fc.git
ignore = dirty ignore = dirty
[submodule "libraries/leveldb"] [submodule "libraries/leveldb"]
path = libraries/leveldb path = libraries/leveldb

4
CMakeLists.txt
View file

@ -65,7 +65,7 @@ IF(NOT "${Boost_VERSION}" MATCHES "1.53(.*)")
SET(Boost_LIBRARIES ${BOOST_LIBRARIES_TEMP} ${Boost_LIBRARIES}) SET(Boost_LIBRARIES ${BOOST_LIBRARIES_TEMP} ${Boost_LIBRARIES})
ENDIF() ENDIF()
set( LEVEL_DB_DIR "${CMAKE_SOURCE_DIR}/libraries/leveldb" ) set( LEVEL_DB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/leveldb" )
file( GLOB LEVEL_DB_SOURCES "${LEVEL_DB_DIR}/db/*.cc" file( GLOB LEVEL_DB_SOURCES "${LEVEL_DB_DIR}/db/*.cc"
"${LEVEL_DB_DIR}/helpers/memenv/memenv.cc" "${LEVEL_DB_DIR}/helpers/memenv/memenv.cc"
@ -115,7 +115,7 @@ if( WIN32 )
SET(LEVELDB_PORT_FILE "${LEVEL_DB_DIR}/port/port_win.cc" ) SET(LEVELDB_PORT_FILE "${LEVEL_DB_DIR}/port/port_win.cc" )
list(APPEND LEVELDB_BUILD_DEFINES OS_WINDOWS LEVELDB_PLATFORM_WINDOWS ) list(APPEND LEVELDB_BUILD_DEFINES OS_WINDOWS LEVELDB_PLATFORM_WINDOWS )
list(APPEND LEVELDB_BUILD_LIBRARIES shlwapi.lib) list(APPEND LEVELDB_BUILD_LIBRARIES shlwapi.lib)
list(INSERT LEVELDB_BUILD_PRIVATE_INCLUDES 0 "${CMAKE_SOURCE_DIR}/libraries/leveldb-msvc/include") list(INSERT LEVELDB_BUILD_PRIVATE_INCLUDES 0 "${CMAKE_CURRENT_SOURCE_DIR}/libraries/leveldb-msvc/include")
else( WIN32 ) # Apple AND Linux else( WIN32 ) # Apple AND Linux
SET(LEVELDB_PORT_FILE "${LEVEL_DB_DIR}/port/port_posix.cc" ) SET(LEVELDB_PORT_FILE "${LEVEL_DB_DIR}/port/port_posix.cc" )

2
libraries/fc

@ -1 +1 @@
Subproject commit 80366e4346e85b550b58ce84d5112a1917f17e07 Subproject commit 1bd8672adf7bfcf621f6ffc5381670577d7590c7

2
libraries/net/CMakeLists.txt
View file

@ -13,7 +13,7 @@ target_link_libraries( graphene_net
PUBLIC fc graphene_db leveldb ) PUBLIC fc graphene_db leveldb )
target_include_directories( graphene_net target_include_directories( graphene_net
PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include"
PRIVATE "${CMAKE_SOURCE_DIR}/libraries/chain/include" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../chain/include"
) )
if(MSVC) if(MSVC)

1
libraries/wallet/include/graphene/wallet/wallet.hpp
View file

@ -19,6 +19,7 @@
#include <graphene/app/api.hpp> #include <graphene/app/api.hpp>
#include <graphene/chain/address.hpp> #include <graphene/chain/address.hpp>
#include <graphene/utilities/key_conversion.hpp>
using namespace graphene::app; using namespace graphene::app;
using namespace graphene::chain; using namespace graphene::chain;