mirror of
https://github.com/obsqrbtz/clrsync.git
synced 2026-04-08 20:19:04 +03:00
fixed limux build
This commit is contained in:
@@ -6,7 +6,7 @@
|
|||||||
namespace clrsync::core
|
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();
|
const std::string version_string();
|
||||||
} // namespace clrsync::core
|
} // namespace clrsync::core
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ set(GUI_SOURCES
|
|||||||
platform/macos/font_loader_macos.cpp
|
platform/macos/font_loader_macos.cpp
|
||||||
platform/linux/file_browser_linux.cpp
|
platform/linux/file_browser_linux.cpp
|
||||||
platform/windows/file_browser_windows.cpp
|
platform/windows/file_browser_windows.cpp
|
||||||
platform/macos/file_browser_macos.mm
|
|
||||||
${CMAKE_SOURCE_DIR}/lib/color_text_edit/TextEditor.cpp
|
${CMAKE_SOURCE_DIR}/lib/color_text_edit/TextEditor.cpp
|
||||||
platform/linux/font_loader_linux.cpp
|
platform/linux/font_loader_linux.cpp
|
||||||
platform/macos/font_loader_macos.cpp
|
platform/macos/font_loader_macos.cpp
|
||||||
@@ -25,6 +24,12 @@ set(GUI_SOURCES
|
|||||||
ui_manager.cpp
|
ui_manager.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if(MACOS)
|
||||||
|
list(APPEND GUI_SOURCES
|
||||||
|
platform/macos/file_browser_macos.mm
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
add_executable(clrsync_gui WIN32 ${GUI_SOURCES})
|
add_executable(clrsync_gui WIN32 ${GUI_SOURCES})
|
||||||
else()
|
else()
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ bool glfw_opengl_backend::initialize(const window_config &config)
|
|||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
|
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
|
||||||
#else
|
#else
|
||||||
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
|
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
|
||||||
#endif
|
#endif
|
||||||
glfwWindowHint(GLFW_RESIZABLE, config.resizable ? GLFW_TRUE : GLFW_FALSE);
|
glfwWindowHint(GLFW_RESIZABLE, config.resizable ? GLFW_TRUE : GLFW_FALSE);
|
||||||
glfwWindowHint(GLFW_DECORATED, config.decorated ? GLFW_TRUE : GLFW_FALSE);
|
glfwWindowHint(GLFW_DECORATED, config.decorated ? GLFW_TRUE : GLFW_FALSE);
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
#include "gui/platform/file_browser.hpp"
|
#include "gui/platform/file_browser.hpp"
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
|
#include <filesystem>
|
||||||
|
|
||||||
namespace file_dialogs
|
namespace file_dialogs
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
#ifdef __WIN32
|
||||||
#include "core/config/config.hpp"
|
#include "core/config/config.hpp"
|
||||||
#include "gui/platform/font_loader.hpp"
|
#include "gui/platform/font_loader.hpp"
|
||||||
#include "imgui_internal.h"
|
#include "imgui_internal.h"
|
||||||
@@ -166,3 +167,4 @@ std::vector<std::string> font_loader::get_system_fonts()
|
|||||||
std::sort(fonts.begin(), fonts.end());
|
std::sort(fonts.begin(), fonts.end());
|
||||||
return fonts;
|
return fonts;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
Reference in New Issue
Block a user