imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-04-02 13:37:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

sys: Fix macOS compilation (as of 2dc1886) (#317)

Browse Source 
* sys: Updated curl to latest version

* sys: Fix macOS compilation

* ui: Fix splash screen OpenGL init for macOS

* sys: Fix std::min compile errors

* git: Re-enabled macos workflow

* sys: Remove includes of the range library

* build: Find OpenGL using CMake

* sys/build: Fix bundled plugins on macOS

* build: Copy plugins to bundle when creating a bundle

* build: Fixup bundled plugins

* sys: Search for plugins in the bundle instead of in Application Support

* sys: Allow resources to be placed in multiple directories on macOS

* build: Output built plugins to the plugins/ directory when not creating a bundle on macOS

* sys: Fix Application Support paths on macOS

* sys: Define ftruncate64 on macOS

* sys: Fix absolute value computation for std::string::at on macOS

Co-authored-by: WerWolv <werwolv98@gmail.com>
This commit is contained in:
Kuruyia
2021-10-09 23:07:58 +02:00
committed by GitHub
parent 21769886fc
commit 72ec6baf79
17 changed files with 100 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/helpers/encoding_file.cpp
View File

@@ -1,6 +1,5 @@
#include "helpers/encoding_file.hpp"
#include <ranges>
#include <hex/helpers/utils.hpp>
#include <fstream>
@@ -17,7 +16,9 @@ namespace hex {
}
std::pair<std::string_view, size_t> EncodingFile::getEncodingFor(const std::vector<u8> &buffer) const {
for (const auto &[size, mapping] : this->m_mapping | std::views::reverse) {
for (auto riter = this->m_mapping.crbegin(); riter != this->m_mapping.crend(); ++riter) {
const auto &[size, mapping] = *riter;
if (size > buffer.size()) continue;
auto key = std::vector<u8>(buffer.begin(), buffer.begin() + size);

2
source/init/splash_window.cpp
View File

@@ -194,7 +194,7 @@ namespace hex::init {
ImGui::StyleColorsDark();
ImGui_ImplGlfw_InitForOpenGL(this->m_window, true);
ImGui_ImplOpenGL3_Init("#version 130");
ImGui_ImplOpenGL3_Init("#version 150");
auto &io = ImGui::GetIO();

2
source/views/view_store.cpp
View File

@@ -82,7 +82,7 @@ namespace hex {
std::vector<u8> buffer(0x10000);
for (u64 offset = 0; offset < header.size; offset += buffer.size()) {
auto readSize = std::min(buffer.size(), header.size - offset);
auto readSize = std::min<u64>(buffer.size(), header.size - offset);
mtar_read_data(&ctx, buffer.data(), readSize);
buffer.resize(readSize);