Skip to content

Commit

Permalink
#215 dissasm fixed changes that reched main when working on collapsib…
Browse files Browse the repository at this point in the history
…le zone features
  • Loading branch information
rzaharia committed Feb 1, 2024
1 parent 88417bb commit cf59f1b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ cmake-build-*/
vcpkg_installed/
.DS_Store
*.db
CMakeUserPresets.json
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 6,
"version": 3,
"cmakeMinimumRequired": {
"major": 3,
"minor": 22,
Expand Down
5 changes: 5 additions & 0 deletions Types/PE/src/pe.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,13 @@ UInt16 e_res[4];)");
auto pe = win->GetObject()->GetContentType<PE::PEFile>();
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<TabPage>(new PE::Panels::Information(win->GetObject(), pe)), true);
Expand Down

0 comments on commit cf59f1b

Please sign in to comment.