Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix

Browse source
This commit is contained in:
dnotestein 2013-10-17 22:19:31 -04:00
commit 2030623243
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -149,7 +149,7 @@ set( BOOST_LIBRARIES ${BOOST_LIBRARIES} PARENT_SCOPE )
#add_executable( test_compress tests/compress.cpp )
#target_link_libraries( test_compress fc ${BOOST_LIBRARIES} )
add_executable( test_aes tests/aes_test.cpp )
target_link_libraries( test_aes fc ${BOOST_LIBRARIES} )
target_link_libraries( test_aes ${pthread_library} ${rt_library} fc ${BOOST_LIBRARIES} ${rt_library} ${pthread_library} ${BOOST_LIBRARIES} )
#add_executable( test_sleep tests/sleep.cpp )
#target_link_libraries( test_sleep fc ${BOOST_LIBRARIES} )

1
src/uint128.cpp
View file

@ -1,6 +1,7 @@
#include <fc/uint128.hpp>
#include <fc/variant.hpp>
#include <fc/crypto/bigint.hpp>
#include <stdexcept>
#ifdef WIN32
#include <WinSock2.h>
#else