From b74f5de4193c094e7805913767c78f75aa982b8a Mon Sep 17 00:00:00 2001 From: ComplexPlane Date: Tue, 19 Nov 2019 12:55:35 -0500 Subject: [PATCH 1/3] Add CMakeLists.txt for elf2rel to build on Linux Also, #include to get uint8_t for gcc --- ttyd-tools/elf2rel/CMakeLists.txt | 16 ++++++++++++++++ ttyd-tools/elf2rel/elf2rel.h | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 ttyd-tools/elf2rel/CMakeLists.txt diff --git a/ttyd-tools/elf2rel/CMakeLists.txt b/ttyd-tools/elf2rel/CMakeLists.txt new file mode 100644 index 00000000..cab61dc6 --- /dev/null +++ b/ttyd-tools/elf2rel/CMakeLists.txt @@ -0,0 +1,16 @@ +cmake_minimum_required(VERSION 3.15) +project(elf2rel) + +set(CMAKE_CXX_STANDARD 17) + +find_package( Boost REQUIRED COMPONENTS program_options ) +include_directories( ${Boost_INCLUDE_DIRS} ) + +include_directories(.) +include_directories(elfio) + +add_executable(elf2rel + elf2rel.cpp) + +target_link_libraries(elf2rel ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_REGEX_LIBRARY}) + diff --git a/ttyd-tools/elf2rel/elf2rel.h b/ttyd-tools/elf2rel/elf2rel.h index 2fb5ad05..76ab2567 100644 --- a/ttyd-tools/elf2rel/elf2rel.h +++ b/ttyd-tools/elf2rel/elf2rel.h @@ -1,6 +1,7 @@ #pragma once #include +#include enum RelRelocationType { @@ -42,4 +43,4 @@ void load(std::vector &buffer, T &value) value |= static_cast(buffer.front()) << ((i - 1) * 8); buffer.erase(buffer.begin()); } -} \ No newline at end of file +} From c6ae1f0d01080b6c7b51de0cf2af2138d8827f5a Mon Sep 17 00:00:00 2001 From: ComplexPlane Date: Tue, 19 Nov 2019 13:16:24 -0500 Subject: [PATCH 2/3] Don't change newlines for now --- ttyd-tools/elf2rel/elf2rel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ttyd-tools/elf2rel/elf2rel.h b/ttyd-tools/elf2rel/elf2rel.h index 76ab2567..feba8721 100644 --- a/ttyd-tools/elf2rel/elf2rel.h +++ b/ttyd-tools/elf2rel/elf2rel.h @@ -43,4 +43,4 @@ void load(std::vector &buffer, T &value) value |= static_cast(buffer.front()) << ((i - 1) * 8); buffer.erase(buffer.begin()); } -} +} \ No newline at end of file From 12fa26e2399c6f2c0b38172258a27b6829d3c682 Mon Sep 17 00:00:00 2001 From: ComplexPlane Date: Tue, 19 Nov 2019 13:21:52 -0500 Subject: [PATCH 3/3] Ignore build directory for elf2rel --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3c4efe20..59aff279 100644 --- a/.gitignore +++ b/.gitignore @@ -258,4 +258,7 @@ paket-files/ # Python Tools for Visual Studio (PTVS) __pycache__/ -*.pyc \ No newline at end of file +*.pyc + +# Build dirs +/ttyd-tools/elf2rel/build/