Fix up submodules, add compile fixes
This commit is contained in:
parent
876e9a125d
commit
d1e2449290
5 changed files with 6 additions and 5 deletions
2
.gitmodules
vendored
2
.gitmodules
vendored
|
|
@ -1,6 +1,6 @@
|
|||
[submodule "libraries/fc"]
|
||||
path = libraries/fc
|
||||
url = git@github.com:cryptonomex/fc
|
||||
url = git@git.syncad.com:/fc.git
|
||||
ignore = dirty
|
||||
[submodule "libraries/leveldb"]
|
||||
path = libraries/leveldb
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ IF(NOT "${Boost_VERSION}" MATCHES "1.53(.*)")
|
|||
SET(Boost_LIBRARIES ${BOOST_LIBRARIES_TEMP} ${Boost_LIBRARIES})
|
||||
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"
|
||||
"${LEVEL_DB_DIR}/helpers/memenv/memenv.cc"
|
||||
|
|
@ -115,7 +115,7 @@ if( WIN32 )
|
|||
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_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
|
||||
SET(LEVELDB_PORT_FILE "${LEVEL_DB_DIR}/port/port_posix.cc" )
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 80366e4346e85b550b58ce84d5112a1917f17e07
|
||||
Subproject commit 1bd8672adf7bfcf621f6ffc5381670577d7590c7
|
||||
|
|
@ -13,7 +13,7 @@ target_link_libraries( graphene_net
|
|||
PUBLIC fc graphene_db leveldb )
|
||||
target_include_directories( graphene_net
|
||||
PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include"
|
||||
PRIVATE "${CMAKE_SOURCE_DIR}/libraries/chain/include"
|
||||
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../chain/include"
|
||||
)
|
||||
|
||||
if(MSVC)
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
|
||||
#include <graphene/app/api.hpp>
|
||||
#include <graphene/chain/address.hpp>
|
||||
#include <graphene/utilities/key_conversion.hpp>
|
||||
|
||||
using namespace graphene::app;
|
||||
using namespace graphene::chain;
|
||||
|
|
|
|||
Loading…
Reference in a new issue