build: Added precompiled headers

landv · Feb 29, 2024 · dd62bee · dd62bee
1 parent f886eac
commit dd62bee
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 55 deletions.
diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
@@ -758,4 +758,15 @@ endfunction()
 function(addIncludesFromLibrary target library)
     get_target_property(library_include_dirs ${library} INTERFACE_INCLUDE_DIRECTORIES)
     target_include_directories(${target} PRIVATE ${library_include_dirs})
+endfunction()
+
+function(precompileHeaders target includeFolder)
+    file(GLOB_RECURSE TARGET_INCLUDES "${includeFolder}/**/*.hpp")
+    set(SYSTEM_INCLUDES "<algorithm>;<array>;<atomic>;<chrono>;<cmath>;<cstddef>;<cstdint>;<cstdio>;<cstdlib>;<cstring>;<exception>;<filesystem>;<functional>;<iterator>;<limits>;<list>;<map>;<memory>;<optional>;<ranges>;<set>;<stdexcept>;<string>;<string_view>;<thread>;<tuple>;<type_traits>;<unordered_map>;<unordered_set>;<utility>;<variant>;<vector>")
+    set(INCLUDES "${SYSTEM_INCLUDES};${TARGET_INCLUDES}")
+    string(REPLACE ">" "$<ANGLE-R>" INCLUDES "${INCLUDES}")
+    target_precompile_headers(${target}
+            PUBLIC
+            "$<$<COMPILE_LANGUAGE:CXX>:${INCLUDES}>"
+    )
 endfunction()
diff --git a/cmake/modules/ImHexPlugin.cmake b/cmake/modules/ImHexPlugin.cmake
@@ -36,8 +36,10 @@ macro(add_imhex_plugin)
 
     # Add include directories and link libraries
     target_include_directories(${IMHEX_PLUGIN_NAME} PUBLIC ${IMHEX_PLUGIN_INCLUDES})
-    target_link_libraries(${IMHEX_PLUGIN_NAME} PRIVATE libimhex ${IMHEX_PLUGIN_LIBRARIES} ${FMT_LIBRARIES} imgui_all_includes libwolv)
+    target_link_libraries(${IMHEX_PLUGIN_NAME} PUBLIC ${IMHEX_PLUGIN_LIBRARIES})
+    target_link_libraries(${IMHEX_PLUGIN_NAME} PRIVATE libimhex ${FMT_LIBRARIES} imgui_all_includes libwolv)
     addIncludesFromLibrary(${IMHEX_PLUGIN_NAME} libpl)
+    addIncludesFromLibrary(${IMHEX_PLUGIN_NAME} libpl-gen)
 
     # Add IMHEX_PROJECT_NAME and IMHEX_VERSION define
     target_compile_definitions(${IMHEX_PLUGIN_NAME} PRIVATE IMHEX_PROJECT_NAME="${IMHEX_PLUGIN_NAME}")
@@ -94,6 +96,8 @@ macro(add_imhex_plugin)
         target_link_libraries(${IMHEX_PLUGIN_NAME} PUBLIC ${IMHEX_PLUGIN_NAME}_tests)
         target_compile_definitions(${IMHEX_PLUGIN_NAME}_tests PRIVATE IMHEX_PROJECT_NAME="${IMHEX_PLUGIN_NAME}-tests")
     endif()
+
+    precompileHeaders(${IMHEX_PLUGIN_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/include")
 endmacro()
 
 macro(add_romfs_resource input output)

diff --git a/lib/external/libwolv b/lib/external/libwolv
diff --git a/lib/libimhex/CMakeLists.txt b/lib/libimhex/CMakeLists.txt
@@ -77,6 +77,8 @@ else()
 
     set(LIBIMHEX_LIBRARY_TYPE PUBLIC)
     target_compile_definitions(libimhex PRIVATE IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+
+    precompileHeaders(libimhex "${CMAKE_CURRENT_SOURCE_DIR}/include")
 endif()
 
 enableUnityBuild(libimhex)

diff --git a/lib/libimhex/include/hex/helpers/http_requests_emscripten.hpp b/lib/libimhex/include/hex/helpers/http_requests_emscripten.hpp
@@ -1,72 +1,76 @@
 #pragma once
 
-#include <future>
+#if defined(OS_WEB)
 
-#include <emscripten/fetch.h>
+    #include <future>
 
-namespace hex {
-    template<typename T>
-    std::future<HttpRequest::Result<T>> HttpRequest::downloadFile(const std::fs::path &path) {
-        return std::async(std::launch::async, [this, path] {
-            std::vector<u8> response;
+    #include <emscripten/fetch.h>
 
-            // Execute the request
-            auto result = this->executeImpl<T>(response);
+    namespace hex {
+        template<typename T>
+        std::future<HttpRequest::Result<T>> HttpRequest::downloadFile(const std::fs::path &path) {
+            return std::async(std::launch::async, [this, path] {
+                std::vector<u8> response;
 
-            // Write the result to the file
-            wolv::io::File file(path, wolv::io::File::Mode::Create);
-            file.writeBuffer(reinterpret_cast<const u8*>(result.getData().data()), result.getData().size());
+                // Execute the request
+                auto result = this->executeImpl<T>(response);
 
-            return result;
-        });
-    }
+                // Write the result to the file
+                wolv::io::File file(path, wolv::io::File::Mode::Create);
+                file.writeBuffer(reinterpret_cast<const u8*>(result.getData().data()), result.getData().size());
 
-    template<typename T>
-    std::future<HttpRequest::Result<T>> HttpRequest::uploadFile(const std::fs::path &path, const std::string &mimeName) {
-        hex::unused(path, mimeName);
-        throw std::logic_error("Not implemented");
-    }
+                return result;
+            });
+        }
 
-    template<typename T>
-    std::future<HttpRequest::Result<T>> HttpRequest::uploadFile(std::vector<u8> data, const std::string &mimeName, const std::fs::path &fileName) {
-        hex::unused(data, mimeName, fileName);
-        throw std::logic_error("Not implemented");
-    }
+        template<typename T>
+        std::future<HttpRequest::Result<T>> HttpRequest::uploadFile(const std::fs::path &path, const std::string &mimeName) {
+            hex::unused(path, mimeName);
+            throw std::logic_error("Not implemented");
+        }
 
-    template<typename T>
-    std::future<HttpRequest::Result<T>> HttpRequest::execute() {
-        return std::async(std::launch::async, [this] {
-            std::vector<u8> responseData;
-
-            return this->executeImpl<T>(responseData);
-        });
-    }
+        template<typename T>
+        std::future<HttpRequest::Result<T>> HttpRequest::uploadFile(std::vector<u8> data, const std::string &mimeName, const std::fs::path &fileName) {
+            hex::unused(data, mimeName, fileName);
+            throw std::logic_error("Not implemented");
+        }
 
-    template<typename T>
-    HttpRequest::Result<T> HttpRequest::executeImpl(std::vector<u8> &data) {
-        strcpy(m_attr.requestMethod, m_method.c_str());
-        m_attr.attributes = EMSCRIPTEN_FETCH_SYNCHRONOUS | EMSCRIPTEN_FETCH_LOAD_TO_MEMORY;
+        template<typename T>
+        std::future<HttpRequest::Result<T>> HttpRequest::execute() {
+            return std::async(std::launch::async, [this] {
+                std::vector<u8> responseData;
 
-        if (!m_body.empty()) {
-            m_attr.requestData = m_body.c_str();
-            m_attr.requestDataSize = m_body.size();
+                return this->executeImpl<T>(responseData);
+            });
         }
 
-        std::vector<const char*> headers;
-        for (auto it = m_headers.begin(); it != m_headers.end(); it++) {
-            headers.push_back(it->first.c_str());
-            headers.push_back(it->second.c_str());
-        }
-        headers.push_back(nullptr);
-        m_attr.requestHeaders = headers.data();
+        template<typename T>
+        HttpRequest::Result<T> HttpRequest::executeImpl(std::vector<u8> &data) {
+            strcpy(m_attr.requestMethod, m_method.c_str());
+            m_attr.attributes = EMSCRIPTEN_FETCH_SYNCHRONOUS | EMSCRIPTEN_FETCH_LOAD_TO_MEMORY;
+
+            if (!m_body.empty()) {
+                m_attr.requestData = m_body.c_str();
+                m_attr.requestDataSize = m_body.size();
+            }
 
-        // Send request
-        emscripten_fetch_t* fetch = emscripten_fetch(&m_attr, m_url.c_str());
+            std::vector<const char*> headers;
+            for (auto it = m_headers.begin(); it != m_headers.end(); it++) {
+                headers.push_back(it->first.c_str());
+                headers.push_back(it->second.c_str());
+            }
+            headers.push_back(nullptr);
+            m_attr.requestHeaders = headers.data();
 
-        data.resize(fetch->numBytes);
-        std::copy(fetch->data, fetch->data + fetch->numBytes, data.begin());
+            // Send request
+            emscripten_fetch_t* fetch = emscripten_fetch(&m_attr, m_url.c_str());
+
+            data.resize(fetch->numBytes);
+            std::copy(fetch->data, fetch->data + fetch->numBytes, data.begin());
+
+            return Result<T>(fetch->status, { data.begin(), data.end() });
+        }
 
-        return Result<T>(fetch->status, { data.begin(), data.end() });
     }
 
-}
+#endif
diff --git a/main/gui/CMakeLists.txt b/main/gui/CMakeLists.txt
@@ -63,6 +63,8 @@ else ()
     target_link_libraries(main PRIVATE pthread)
 endif ()
 
+precompileHeaders(main ${CMAKE_CURRENT_SOURCE_DIR}/include)
+
 if (APPLE)
     add_compile_definitions(GL_SILENCE_DEPRECATION)
 endif ()
diff --git a/plugins/disassembler/include/content/helpers/disassembler.hpp b/plugins/disassembler/include/content/helpers/disassembler.hpp
@@ -2,6 +2,8 @@
 
 #include <hex.hpp>
 
+#include <array>
+
 #include <capstone/capstone.h>
 
 namespace hex::plugin::disasm {

diff --git a/plugins/ui/CMakeLists.txt b/plugins/ui/CMakeLists.txt
@@ -13,6 +13,7 @@ add_imhex_plugin(
     INCLUDES
         include
     LIBRARIES
+        libpl
         libpl-gen
         fonts
     LIBRARY_PLUGIN

diff --git a/plugins/ui/include/popups/popup_file_chooser.hpp b/plugins/ui/include/popups/popup_file_chooser.hpp
@@ -9,6 +9,8 @@
 
 #include <functional>
 #include <string>
+#include <vector>
+#include <set>
 
 namespace hex::ui {