From cf59f1bd856622ddbf5cad8e93d626ecc51c6110 Mon Sep 17 00:00:00 2001 From: Raul Zaharia Date: Thu, 1 Feb 2024 11:47:56 +0200 Subject: [PATCH] #215 dissasm fixed changes that reched main when working on collapsible zone features --- .gitignore | 1 + CMakeLists.txt | 3 +++ CMakePresets.json | 2 +- Types/PE/src/pe.cpp | 5 +++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a23bdc10..35fb673a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ cmake-build-*/ vcpkg_installed/ .DS_Store *.db +CMakeUserPresets.json diff --git a/CMakeLists.txt b/CMakeLists.txt index fb4bafe3..1c009a13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,6 +131,9 @@ if (NOT DEBUG_BUILD) endif() endif() +if(DEFINED DISSASM_DEV) + add_definitions(-DDISSASM_DEV) +endif() set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED True) diff --git a/CMakePresets.json b/CMakePresets.json index b28b5d8e..ff766121 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -1,5 +1,5 @@ { - "version": 6, + "version": 3, "cmakeMinimumRequired": { "major": 3, "minor": 22, diff --git a/Types/PE/src/pe.cpp b/Types/PE/src/pe.cpp index 3eba64dd..5e11d87b 100644 --- a/Types/PE/src/pe.cpp +++ b/Types/PE/src/pe.cpp @@ -217,8 +217,13 @@ UInt16 e_res[4];)"); auto pe = win->GetObject()->GetContentType(); pe->Update(); +#ifdef DISSASM_DEV CreateDissasmView(win, pe); CreateBufferView(win, pe); +#else + CreateBufferView(win, pe); + CreateDissasmView(win, pe); +#endif if (pe->HasPanel(PE::Panels::IDs::Information)) win->AddPanel(Pointer(new PE::Panels::Information(win->GetObject(), pe)), true);