diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-10-20 20:55:39 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-10-20 20:55:53 +0200 |
| commit | 14dd279fe123d7b48baed82d9109c585839b678f (patch) | |
| tree | a79e281f205a0578312aa3b7cfc9a488036b9078 /src/blocks/CMakeLists.txt | |
| parent | Merge pull request #432 (diff) | |
| parent | blockchain_export can now export to a blocks.dat format (diff) | |
| download | monero-14dd279fe123d7b48baed82d9109c585839b678f.tar.xz | |
Merge pull request #437
b13e7f2 blockchain_export can now export to a blocks.dat format (moneromooo-monero)
11db442 bootstrap_file: do not try to create a directory with an empty name (moneromooo-monero)
03bc610 hardfork: use DB transactions when reorganizing (moneromooo-monero)
439c455 hardfork: simplify work done on reload (moneromooo-monero)
Diffstat (limited to 'src/blocks/CMakeLists.txt')
| -rw-r--r-- | src/blocks/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/blocks/CMakeLists.txt b/src/blocks/CMakeLists.txt index 4020132a9..66512e7ab 100644 --- a/src/blocks/CMakeLists.txt +++ b/src/blocks/CMakeLists.txt @@ -30,9 +30,9 @@ if(APPLE) add_library(blocks STATIC blockexports.c) set_target_properties(blocks PROPERTIES LINKER_LANGUAGE C) else() - add_custom_command(OUTPUT blocks.o COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ld -r -b binary -o ${CMAKE_CURRENT_BINARY_DIR}/blocks.o blocks.dat) - add_library(blocks STATIC blocks.o blockexports.c) + add_custom_command(OUTPUT blocks.o COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ld -r -b binary -o ${CMAKE_CURRENT_BINARY_DIR}/blocks.o blocks.dat) + add_custom_command(OUTPUT testnet_blocks.o COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ld -r -b binary -o ${CMAKE_CURRENT_BINARY_DIR}/testnet_blocks.o testnet_blocks.dat) + add_library(blocks STATIC blocks.o testnet_blocks.o blockexports.c) set_target_properties(blocks PROPERTIES LINKER_LANGUAGE C) endif() - |