summaryrefslogtreecommitdiff
path: root/disasm
diff options
context:
space:
mode:
authorDennis Brentjes <d.brentjes@gmail.com>2016-09-06 11:54:01 +0200
committerDennis Brentjes <d.brentjes@gmail.com>2016-09-06 11:54:01 +0200
commita10cf47a9701a4d0be83940a23a8edf9a5ed7b5e (patch)
treed7757f29e9b027e19cd0fa339f487ce48a7790bd /disasm
parent0fdd68c9e963f9e18a8dcc6ef990ccea98f4d764 (diff)
downloadopenwar-a10cf47a9701a4d0be83940a23a8edf9a5ed7b5e.tar.gz
openwar-a10cf47a9701a4d0be83940a23a8edf9a5ed7b5e.tar.bz2
openwar-a10cf47a9701a4d0be83940a23a8edf9a5ed7b5e.zip
Properly uses cmake to link with distorm3.
Diffstat (limited to 'disasm')
-rw-r--r--disasm/CMakeLists.txt10
-rw-r--r--disasm/disasm.cpp2
2 files changed, 6 insertions, 6 deletions
diff --git a/disasm/CMakeLists.txt b/disasm/CMakeLists.txt
index e433d10..e9cd3d2 100644
--- a/disasm/CMakeLists.txt
+++ b/disasm/CMakeLists.txt
@@ -5,12 +5,12 @@ add_executable(disasm
find_package(Boost COMPONENTS filesystem program_options system REQUIRED)
+find_package(distorm3 REQUIRED CONFIG)
+
target_link_libraries(disasm
PRIVATE le
- PRIVATE ${Boost_LIBRARIES}
+ PRIVATE Boost::program_options
+ PRIVATE Boost::system
+ PRIVATE Boost::filesystem
PRIVATE distorm3
)
-
-target_include_directories(disasm
- PRIVATE ${Boost_INCLUDE_DIRS}
-) \ No newline at end of file
diff --git a/disasm/disasm.cpp b/disasm/disasm.cpp
index 862813c..09b9b02 100644
--- a/disasm/disasm.cpp
+++ b/disasm/disasm.cpp
@@ -67,7 +67,7 @@ int main(int argc, char* argv[]) {
auto index = eip_object.page_table_index;
auto page = x.object_page_table.entries[index];
- binparse::Offset32 offset = x.le_offset + x.le_header.data_page_offset;
+ binparse::Offset32 offset = x.le_header.data_page_offset;
auto result = distorm_decode64(0x00010000, code.data() + offset, x.object_table.entries[1].nr_page_table_entries * x.le_header.page_size, Decode32Bits, instructions.data(), instructions.size(), &read_inst);