Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-22 12:50:29 +01:00
Code Releases Wiki Activity

build: Move menu items handler into libimhex

Browse Source
This commit is contained in:
WerWolv 2025-02-16 15:48:44 +01:00
parent 67340e1526
commit 879e4c9d58
11 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libimhex/CMakeLists.txt
View File

@ -66,7 +66,10 @@ if (APPLE)
endif () endif ()
endif () endif ()
set(LIBIMHEX_SOURCES ${LIBIMHEX_SOURCES} source/helpers/utils_macos.m) set(LIBIMHEX_SOURCES ${LIBIMHEX_SOURCES}
source/helpers/utils_macos.m
source/helpers/macos_menu.m
)
endif () endif ()
if (IMHEX_EXTERNAL_PLUGIN_BUILD) if (IMHEX_EXTERNAL_PLUGIN_BUILD)

0
plugins/ui/include/ui/menu_items.hpp → lib/libimhex/include/hex/helpers/menu_items.hpp
View File

0
plugins/ui/source/ui/macos_menu.m → lib/libimhex/source/helpers/macos_menu.m
View File

2
plugins/builtin/source/content/main_menu_items.cpp
View File

@ -24,7 +24,7 @@
#include <wolv/literals.hpp> #include <wolv/literals.hpp>
#include <romfs/romfs.hpp> #include <romfs/romfs.hpp>
#include <ui/menu_items.hpp> #include <hex/helpers/menu_items.hpp>
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>

2
plugins/builtin/source/content/recent.cpp
View File

@ -21,7 +21,7 @@
#include <ranges> #include <ranges>
#include <unordered_set> #include <unordered_set>
#include <ui/menu_items.hpp> #include <hex/helpers/menu_items.hpp>
namespace hex::plugin::builtin::recent { namespace hex::plugin::builtin::recent {

2
plugins/builtin/source/content/views/view_about.cpp
View File

@ -20,7 +20,7 @@
#include <wolv/utils/string.hpp> #include <wolv/utils/string.hpp>
#include <string> #include <string>
#include <ui/menu_items.hpp> #include <hex/helpers/menu_items.hpp>
namespace hex::plugin::builtin { namespace hex::plugin::builtin {

2
plugins/builtin/source/content/views/view_hex_editor.cpp
View File

@ -25,7 +25,7 @@
#include <content/popups/popup_blocking_task.hpp> #include <content/popups/popup_blocking_task.hpp>
#include <content/popups/hex_editor/popup_hex_editor_find.hpp> #include <content/popups/hex_editor/popup_hex_editor_find.hpp>
#include <pl/patterns/pattern.hpp> #include <pl/patterns/pattern.hpp>
#include <ui/menu_items.hpp> #include <hex/helpers/menu_items.hpp>
#include <wolv/literals.hpp> #include <wolv/literals.hpp>
using namespace std::literals::string_literals; using namespace std::literals::string_literals;

2
plugins/builtin/source/content/views/view_pattern_editor.cpp
View File

@ -36,7 +36,7 @@
#include <content/global_actions.hpp> #include <content/global_actions.hpp>
#include <fonts/fonts.hpp> #include <fonts/fonts.hpp>
#include <ui/menu_items.hpp> #include <hex/helpers/menu_items.hpp>
namespace hex::plugin::builtin { namespace hex::plugin::builtin {

2
plugins/builtin/source/content/window_decoration.cpp
View File

@ -12,7 +12,7 @@
#include <imgui_internal.h> #include <imgui_internal.h>
#include <random> #include <random>
#include <hex/ui/imgui_imhex_extensions.h> #include <hex/ui/imgui_imhex_extensions.h>
#include <ui/menu_items.hpp> #include <hex/helpers/menu_items.hpp>
#include <fonts/vscode_icons.hpp> #include <fonts/vscode_icons.hpp>
#include <hex/api/tutorial_manager.hpp> #include <hex/api/tutorial_manager.hpp>

7
plugins/ui/CMakeLists.txt
View File

@ -18,10 +18,3 @@ add_imhex_plugin(
fonts fonts
LIBRARY_PLUGIN LIBRARY_PLUGIN
) )
if (APPLE)
target_sources(ui PRIVATE source/ui/macos_menu.m)
find_library(FOUNDATION NAMES Foundation REQUIRED)
find_library(COCOA NAMES Cocoa REQUIRED)
target_link_libraries(ui PUBLIC ${FOUNDATION} ${COCOA})
endif()

2
plugins/ui/source/ui/menu_items.cpp
View File

@ -1,4 +1,4 @@
#include <ui/menu_items.hpp> #include <../../../../lib/libimhex/include/hex/helpers/menu_items.hpp>
#include <imgui.h> #include <imgui.h>
#include <imgui_internal.h> #include <imgui_internal.h>