Skip to content

Commit

Permalink
Update ImGui to v1.65
Browse files Browse the repository at this point in the history
  • Loading branch information
binji committed Sep 13, 2018
1 parent 4d1ffb8 commit da18524
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 2 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ else ()
if (CMAKE_COMPILER_IS_GNUCXX AND
CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8)
# TODO(binji): These warnings should only be disabled for imgui.
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}
"-Wno-class-memaccess -Wno-stringop-truncation"
)
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -Wno-stringop-truncation)
endif ()
endif ()

Expand Down Expand Up @@ -68,6 +66,7 @@ if (NOT EMSCRIPTEN)
add_executable(binjgb-debugger
third_party/imgui/imgui.cpp
third_party/imgui/imgui_draw.cpp
third_party/imgui/imgui_widgets.cpp
third_party/imgui_dock/imgui_dock.cpp
src/memory.c
src/common.c
Expand Down
2 changes: 2 additions & 0 deletions src/debugger/debugger.cc
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ bool Debugger::Init(const char* filename, int audio_frequency, int audio_frames,
return false;
}

ImGui::CreateContext();

run_state = paused_at_start ? Paused : Running;

ZERO_MEMORY(emulator_init);
Expand Down
2 changes: 1 addition & 1 deletion third_party/imgui
Submodule imgui updated 206 files

0 comments on commit da18524

Please sign in to comment.