From fb4c21b97af436ba7c77d5f0f5a0ec9e5f0f31a8 Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Tue, 26 Jul 2022 14:59:08 +0200
Subject: [PATCH] build: Fix weird macOS build errors (#591)

* cleanup

* Remove prints
---
 dist/Brewfile                                             | 1 -
 lib/external/imgui/CMakeLists.txt                         | 8 ++++----
 lib/external/imgui/{ => include}/fonts/codicons_font.h    | 0
 lib/external/imgui/{ => include}/fonts/fontawesome_font.h | 0
 lib/external/imgui/{ => include}/fonts/unifont_font.h     | 0
 lib/external/imgui/{ => source}/fonts/codicons_font.c     | 0
 lib/external/imgui/{ => source}/fonts/fontawesome_font.c  | 0
 lib/external/imgui/{ => source}/fonts/unifont_font.c      | 0
 lib/libimhex/include/hex/ui/view.hpp                      | 4 ++--
 main/source/init/splash_window.cpp                        | 2 +-
 main/source/init/tasks.cpp                                | 6 +++---
 main/source/window/win_window.cpp                         | 2 +-
 main/source/window/window.cpp                             | 2 +-
 plugins/builtin/source/content/ui_items.cpp               | 2 +-
 plugins/builtin/source/content/welcome_screen.cpp         | 4 ++--
 plugins/windows/source/content/ui_items.cpp               | 4 ++--
 16 files changed, 17 insertions(+), 18 deletions(-)
 rename lib/external/imgui/{ => include}/fonts/codicons_font.h (100%)
 rename lib/external/imgui/{ => include}/fonts/fontawesome_font.h (100%)
 rename lib/external/imgui/{ => include}/fonts/unifont_font.h (100%)
 rename lib/external/imgui/{ => source}/fonts/codicons_font.c (100%)
 rename lib/external/imgui/{ => source}/fonts/fontawesome_font.c (100%)
 rename lib/external/imgui/{ => source}/fonts/unifont_font.c (100%)

diff --git a/dist/Brewfile b/dist/Brewfile
index 0fcd0494b..5deb156f5 100644
--- a/dist/Brewfile
+++ b/dist/Brewfile
@@ -7,5 +7,4 @@ brew "python3"
 brew "freetype2"
 brew "libmagic"
 brew "pkg-config"
-brew "llvm"
 brew "gcc@12"
diff --git a/lib/external/imgui/CMakeLists.txt b/lib/external/imgui/CMakeLists.txt
index f9168f11d..239fe72ae 100644
--- a/lib/external/imgui/CMakeLists.txt
+++ b/lib/external/imgui/CMakeLists.txt
@@ -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})
 
diff --git a/lib/external/imgui/fonts/codicons_font.h b/lib/external/imgui/include/fonts/codicons_font.h
similarity index 100%
rename from lib/external/imgui/fonts/codicons_font.h
rename to lib/external/imgui/include/fonts/codicons_font.h
diff --git a/lib/external/imgui/fonts/fontawesome_font.h b/lib/external/imgui/include/fonts/fontawesome_font.h
similarity index 100%
rename from lib/external/imgui/fonts/fontawesome_font.h
rename to lib/external/imgui/include/fonts/fontawesome_font.h
diff --git a/lib/external/imgui/fonts/unifont_font.h b/lib/external/imgui/include/fonts/unifont_font.h
similarity index 100%
rename from lib/external/imgui/fonts/unifont_font.h
rename to lib/external/imgui/include/fonts/unifont_font.h
diff --git a/lib/external/imgui/fonts/codicons_font.c b/lib/external/imgui/source/fonts/codicons_font.c
similarity index 100%
rename from lib/external/imgui/fonts/codicons_font.c
rename to lib/external/imgui/source/fonts/codicons_font.c
diff --git a/lib/external/imgui/fonts/fontawesome_font.c b/lib/external/imgui/source/fonts/fontawesome_font.c
similarity index 100%
rename from lib/external/imgui/fonts/fontawesome_font.c
rename to lib/external/imgui/source/fonts/fontawesome_font.c
diff --git a/lib/external/imgui/fonts/unifont_font.c b/lib/external/imgui/source/fonts/unifont_font.c
similarity index 100%
rename from lib/external/imgui/fonts/unifont_font.c
rename to lib/external/imgui/source/fonts/unifont_font.c
diff --git a/lib/libimhex/include/hex/ui/view.hpp b/lib/libimhex/include/hex/ui/view.hpp
index 3d11a8c30..6d0664db3 100644
--- a/lib/libimhex/include/hex/ui/view.hpp
+++ b/lib/libimhex/include/hex/ui/view.hpp
@@ -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>
diff --git a/main/source/init/splash_window.cpp b/main/source/init/splash_window.cpp
index e70754c84..af0788eec 100644
--- a/main/source/init/splash_window.cpp
+++ b/main/source/init/splash_window.cpp
@@ -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>
diff --git a/main/source/init/tasks.cpp b/main/source/init/tasks.cpp
index 901868af0..db4aab70b 100644
--- a/main/source/init/tasks.cpp
+++ b/main/source/init/tasks.cpp
@@ -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>
 
diff --git a/main/source/window/win_window.cpp b/main/source/window/win_window.cpp
index fe95aba59..9944c0c32 100644
--- a/main/source/window/win_window.cpp
+++ b/main/source/window/win_window.cpp
@@ -9,7 +9,7 @@
 
     #include <imgui.h>
     #include <imgui_internal.h>
-    #include <codicons_font.h>
+    #include <fonts/codicons_font.h>
 
     #include <nlohmann/json.hpp>
 
diff --git a/main/source/window/window.cpp b/main/source/window/window.cpp
index 2ffbd7468..180248eb1 100644
--- a/main/source/window/window.cpp
+++ b/main/source/window/window.cpp
@@ -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>
 
diff --git a/plugins/builtin/source/content/ui_items.cpp b/plugins/builtin/source/content/ui_items.cpp
index 9d9fda8de..8df0c7bea 100644
--- a/plugins/builtin/source/content/ui_items.cpp
+++ b/plugins/builtin/source/content/ui_items.cpp
@@ -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>
diff --git a/plugins/builtin/source/content/welcome_screen.cpp b/plugins/builtin/source/content/welcome_screen.cpp
index c4818e497..39094d6a9 100644
--- a/plugins/builtin/source/content/welcome_screen.cpp
+++ b/plugins/builtin/source/content/welcome_screen.cpp
@@ -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>
 
diff --git a/plugins/windows/source/content/ui_items.cpp b/plugins/windows/source/content/ui_items.cpp
index 7d74142b1..583472818 100644
--- a/plugins/windows/source/content/ui_items.cpp
+++ b/plugins/windows/source/content/ui_items.cpp
@@ -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 {