1
0
mirror of synced 2024-11-12 02:00:52 +01:00

build: Fix weird macOS build errors (#591)

* cleanup

* Remove prints
This commit is contained in:
WerWolv 2022-07-26 14:59:08 +02:00 committed by GitHub
parent d356993e33
commit fb4c21b97a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 17 additions and 18 deletions

1
dist/Brewfile vendored
View File

@ -7,5 +7,4 @@ brew "python3"
brew "freetype2"
brew "libmagic"
brew "pkg-config"
brew "llvm"
brew "gcc@12"

View File

@ -32,14 +32,14 @@ add_library(imgui OBJECT
source/implot_items.cpp
source/implot_demo.cpp
fonts/fontawesome_font.c
fonts/codicons_font.c
fonts/unifont_font.c
source/fonts/fontawesome_font.c
source/fonts/codicons_font.c
source/fonts/unifont_font.c
)
add_compile_definitions(IMGUI_IMPL_OPENGL_LOADER_GLAD)
target_include_directories(imgui PUBLIC include fonts ${CMAKE_CURRENT_SOURCE_DIR} ${FREETYPE_INCLUDE_DIRS} ${GLFW_INCLUDE_DIRS})
target_include_directories(imgui PUBLIC include ${FREETYPE_INCLUDE_DIRS} ${GLFW_INCLUDE_DIRS})
target_link_directories(imgui PUBLIC ${GLFW_LIBRARY_DIRS})

View File

@ -7,8 +7,8 @@
#include <imgui_internal.h>
#include <hex/ui/imgui_imhex_extensions.h>
#include <fontawesome_font.h>
#include <codicons_font.h>
#include <fonts/fontawesome_font.h>
#include <fonts/codicons_font.h>
#include <hex/api/imhex_api.hpp>
#include <hex/api/event.hpp>

View File

@ -13,7 +13,7 @@
#include <hex/ui/imgui_imhex_extensions.h>
#include <imgui_impl_glfw.h>
#include <imgui_impl_opengl3.h>
#include <fontawesome_font.h>
#include <fonts/fontawesome_font.h>
#include <GLFW/glfw3.h>
#include <unistd.h>

View File

@ -9,9 +9,9 @@
#include <hex/helpers/fs.hpp>
#include <hex/helpers/logger.hpp>
#include <fontawesome_font.h>
#include <codicons_font.h>
#include <unifont_font.h>
#include <fonts/fontawesome_font.h>
#include <fonts/codicons_font.h>
#include <fonts/unifont_font.h>
#include <hex/api/plugin_manager.hpp>

View File

@ -9,7 +9,7 @@
#include <imgui.h>
#include <imgui_internal.h>
#include <codicons_font.h>
#include <fonts/codicons_font.h>
#include <nlohmann/json.hpp>

View File

@ -30,7 +30,7 @@
#include <imnodes.h>
#include <imnodes_internal.h>
#include <codicons_font.h>
#include <fonts/codicons_font.h>
#include <hex/helpers/project_file_handler.hpp>

View File

@ -6,7 +6,7 @@
#include <hex/helpers/fmt.hpp>
#include <hex/helpers/logger.hpp>
#include <codicons_font.h>
#include <fonts/codicons_font.h>
#include <imgui.h>
#include <imgui_internal.h>
#include <hex/ui/imgui_imhex_extensions.h>

View File

@ -18,8 +18,8 @@
#include <nlohmann/json.hpp>
#include <romfs/romfs.hpp>
#include <fontawesome_font.h>
#include <codicons_font.h>
#include <fonts/fontawesome_font.h>
#include <fonts/codicons_font.h>
#include <list>

View File

@ -8,8 +8,8 @@
#include <imgui.h>
#include <hex/ui/imgui_imhex_extensions.h>
#include <fontawesome_font.h>
#include <codicons_font.h>
#include <fonts/fontawesome_font.h>
#include <fonts/codicons_font.h>
namespace hex::plugin::windows {