From 9be0a159ea777fc87b21b27874b5511d43ec283b Mon Sep 17 00:00:00 2001 From: Daniel Dada Date: Thu, 18 Dec 2025 23:53:06 +0300 Subject: [PATCH] fixed limux build --- src/core/common/version.hpp | 2 +- src/gui/CMakeLists.txt | 7 ++++++- src/gui/backend/glfw_opengl.cpp | 2 +- src/gui/platform/linux/file_browser_linux.cpp | 1 + src/gui/platform/windows/font_loader_windows.cpp | 2 ++ 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/core/common/version.hpp b/src/core/common/version.hpp index 6079a1d..b570a5a 100644 --- a/src/core/common/version.hpp +++ b/src/core/common/version.hpp @@ -6,7 +6,7 @@ namespace clrsync::core { -const std::string GIT_SEMVER = "0.1.6+git.gc68ca3d"; +const std::string GIT_SEMVER = "0.1.6+git.g0288773"; const std::string version_string(); } // namespace clrsync::core diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index c18c41d..a8e90d7 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -16,7 +16,6 @@ set(GUI_SOURCES platform/macos/font_loader_macos.cpp platform/linux/file_browser_linux.cpp platform/windows/file_browser_windows.cpp - platform/macos/file_browser_macos.mm ${CMAKE_SOURCE_DIR}/lib/color_text_edit/TextEditor.cpp platform/linux/font_loader_linux.cpp platform/macos/font_loader_macos.cpp @@ -25,6 +24,12 @@ set(GUI_SOURCES ui_manager.cpp ) +if(MACOS) + list(APPEND GUI_SOURCES + platform/macos/file_browser_macos.mm + ) +endif() + if(WIN32) add_executable(clrsync_gui WIN32 ${GUI_SOURCES}) else() diff --git a/src/gui/backend/glfw_opengl.cpp b/src/gui/backend/glfw_opengl.cpp index a547b9b..3f8a6ae 100644 --- a/src/gui/backend/glfw_opengl.cpp +++ b/src/gui/backend/glfw_opengl.cpp @@ -31,7 +31,7 @@ bool glfw_opengl_backend::initialize(const window_config &config) #ifdef __APPLE__ glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2); #else - glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0); + glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3); #endif glfwWindowHint(GLFW_RESIZABLE, config.resizable ? GLFW_TRUE : GLFW_FALSE); glfwWindowHint(GLFW_DECORATED, config.decorated ? GLFW_TRUE : GLFW_FALSE); diff --git a/src/gui/platform/linux/file_browser_linux.cpp b/src/gui/platform/linux/file_browser_linux.cpp index f35eaa7..1249bfe 100644 --- a/src/gui/platform/linux/file_browser_linux.cpp +++ b/src/gui/platform/linux/file_browser_linux.cpp @@ -2,6 +2,7 @@ #include "gui/platform/file_browser.hpp" #include +#include namespace file_dialogs { diff --git a/src/gui/platform/windows/font_loader_windows.cpp b/src/gui/platform/windows/font_loader_windows.cpp index 3ef8230..1e3ce0e 100644 --- a/src/gui/platform/windows/font_loader_windows.cpp +++ b/src/gui/platform/windows/font_loader_windows.cpp @@ -1,3 +1,4 @@ +#ifdef __WIN32 #include "core/config/config.hpp" #include "gui/platform/font_loader.hpp" #include "imgui_internal.h" @@ -166,3 +167,4 @@ std::vector font_loader::get_system_fonts() std::sort(fonts.begin(), fonts.end()); return fonts; } +#endif \ No newline at end of file