-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #237 from AntelopeIO/antler-run-removal
Antler run removal
- Loading branch information
Showing
27 changed files
with
69 additions
and
437 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,72 +1,49 @@ | ||
set(PARENT_PROJECT_NAME ${PROJECT_NAME}) | ||
|
||
file(GLOB HEADERS "*.hpp" | ||
"*.h") | ||
|
||
if (${PARENT_PROJECT_NAME} STREQUAL "cdt_tools") | ||
project(native_eosio) | ||
add_library( ${PROJECT_NAME} | ||
eosiolib.cpp | ||
crypto.cpp | ||
malloc.cpp | ||
${HEADERS} ) | ||
target_compile_definitions(${PROJECT_NAME} PUBLIC EOSIO_NATIVE EOSIOLIB_DISABLE_MALLOC) | ||
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_SOURCE_DIR}/../libraries/eosiolib/core | ||
${CMAKE_SOURCE_DIR}/../libraries/meta_refl/include) | ||
target_compile_options(${PROJECT_NAME} PUBLIC -fPIC -fexceptions -fno-rtti) | ||
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") | ||
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "12.0") | ||
target_compile_options(${PROJECT_NAME} PUBLIC -Wno-attributes) | ||
else() | ||
target_compile_options(${PROJECT_NAME} PUBLIC -Wno-attributes=gnu::eosio_wasm_import) | ||
target_compile_options(${PROJECT_NAME} PUBLIC -Wno-attributes=eosio::ignore) | ||
endif() | ||
endif() | ||
else() | ||
add_library(eosio | ||
eosiolib.cpp | ||
crypto.cpp | ||
${HEADERS}) | ||
add_library(eosio | ||
eosiolib.cpp | ||
crypto.cpp | ||
${HEADERS}) | ||
|
||
add_library(eosio_malloc | ||
malloc.cpp | ||
${HEADERS}) | ||
add_library(eosio_malloc | ||
malloc.cpp | ||
${HEADERS}) | ||
|
||
add_library(eosio_dsm | ||
simple_malloc.cpp | ||
${HEADERS}) | ||
add_library(eosio_dsm | ||
simple_malloc.cpp | ||
${HEADERS}) | ||
|
||
add_library(eosio_cmem | ||
memory.cpp | ||
${HEADERS}) | ||
add_library(eosio_cmem | ||
memory.cpp | ||
${HEADERS}) | ||
|
||
|
||
set_target_properties(eosio_malloc PROPERTIES LINKER_LANGUAGE C) | ||
set_target_properties(eosio_malloc PROPERTIES LINKER_LANGUAGE C) | ||
|
||
target_include_directories(eosio PUBLIC | ||
${CMAKE_SOURCE_DIR}/libc/cdt-musl/include | ||
${CMAKE_SOURCE_DIR}/libc/cdt-musl/src/internal | ||
${CMAKE_SOURCE_DIR}/libc/cdt-musl/src/crypt | ||
${CMAKE_SOURCE_DIR}/libc/cdt-musl/arch/eos | ||
${CMAKE_SOURCE_DIR}/libc++/cdt-libcxx/include | ||
${CMAKE_SOURCE_DIR}) | ||
target_include_directories(eosio PUBLIC | ||
${CMAKE_SOURCE_DIR}/libc/cdt-musl/include | ||
${CMAKE_SOURCE_DIR}/libc/cdt-musl/src/internal | ||
${CMAKE_SOURCE_DIR}/libc/cdt-musl/src/crypt | ||
${CMAKE_SOURCE_DIR}/libc/cdt-musl/arch/eos | ||
${CMAKE_SOURCE_DIR}/libc++/cdt-libcxx/include | ||
${CMAKE_SOURCE_DIR}) | ||
|
||
target_link_libraries( eosio c c++ ) | ||
add_custom_command( TARGET eosio POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:eosio> ${BASE_BINARY_DIR}/lib ) | ||
add_custom_command( TARGET eosio_malloc POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:eosio_malloc> ${BASE_BINARY_DIR}/lib ) | ||
add_custom_command( TARGET eosio_dsm POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:eosio_dsm> ${BASE_BINARY_DIR}/lib ) | ||
add_custom_command( TARGET eosio_cmem POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:eosio_cmem> ${BASE_BINARY_DIR}/lib ) | ||
target_link_libraries( eosio c c++ ) | ||
add_custom_command( TARGET eosio POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:eosio> ${BASE_BINARY_DIR}/lib ) | ||
add_custom_command( TARGET eosio_malloc POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:eosio_malloc> ${BASE_BINARY_DIR}/lib ) | ||
add_custom_command( TARGET eosio_dsm POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:eosio_dsm> ${BASE_BINARY_DIR}/lib ) | ||
add_custom_command( TARGET eosio_cmem POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:eosio_cmem> ${BASE_BINARY_DIR}/lib ) | ||
|
||
if (ENABLE_NATIVE_COMPILER) | ||
add_native_library(native_eosio | ||
eosiolib.cpp | ||
crypto.cpp | ||
malloc.cpp | ||
${HEADERS}) | ||
if (ENABLE_NATIVE_COMPILER) | ||
add_native_library(native_eosio | ||
eosiolib.cpp | ||
crypto.cpp | ||
malloc.cpp | ||
${HEADERS}) | ||
|
||
add_dependencies( native_eosio eosio ) | ||
add_custom_command( TARGET native_eosio POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:native_eosio> ${BASE_BINARY_DIR}/lib ) | ||
endif() | ||
add_dependencies( native_eosio eosio ) | ||
add_custom_command( TARGET native_eosio POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:native_eosio> ${BASE_BINARY_DIR}/lib ) | ||
endif() | ||
|
||
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/../eosiolib DESTINATION ${BASE_BINARY_DIR}/include FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp") | ||
endif() | ||
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/../eosiolib DESTINATION ${BASE_BINARY_DIR}/include FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,8 +6,6 @@ | |
#pragma once | ||
|
||
#include "types.h" | ||
#include "eosio/types.hpp" | ||
|
||
#ifdef __cplusplus | ||
extern "C" { | ||
#endif | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,7 @@ | |
#include <optional> | ||
#include <variant> | ||
|
||
#include <cstring> | ||
#include <string.h> | ||
|
||
namespace eosio { | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,6 @@ | |
*/ | ||
#pragma once | ||
#include "datastream.hpp" | ||
#include "types.hpp" | ||
|
||
#include <array> | ||
#include <algorithm> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,7 +5,7 @@ | |
#pragma once | ||
#include <utility> | ||
#include <string> | ||
#include "types.hpp" | ||
|
||
|
||
|
||
namespace eosio { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.