diff --git a/AUR/PKGBUILD b/AUR/PKGBUILD index 65632f0..b23c026 100644 --- a/AUR/PKGBUILD +++ b/AUR/PKGBUILD @@ -7,15 +7,11 @@ arch=('x86_64') url="https://github.com/obsqrbtz/clrsync" license=('MIT') depends=( - glfw-x11 + glfw freetype2 fontconfig - libx11 - libxrandr - libxi mesa libglvnd - libxinerama libxcursor ) makedepends=('cmake') diff --git a/AUR/PKGBUILD-git b/AUR/PKGBUILD-git index 89faf8e..ba82d21 100644 --- a/AUR/PKGBUILD-git +++ b/AUR/PKGBUILD-git @@ -7,15 +7,11 @@ arch=('x86_64') url="https://github.com/obsqrbtz/clrsync" license=('MIT') depends=( - glfw-x11 + glfw freetype2 fontconfig - libx11 - libxrandr - libxi mesa libglvnd - libxinerama libxcursor ) makedepends=('cmake' 'git') diff --git a/AUR/PKGBUILD.in b/AUR/PKGBUILD.in index 76c2b4c..a21b495 100644 --- a/AUR/PKGBUILD.in +++ b/AUR/PKGBUILD.in @@ -7,15 +7,11 @@ arch=('x86_64') url="https://github.com/obsqrbtz/clrsync" license=('MIT') depends=( - glfw-x11 + glfw freetype2 fontconfig - libx11 - libxrandr - libxi mesa libglvnd - libxinerama libxcursor ) makedepends=('cmake') diff --git a/CMakeLists.txt b/CMakeLists.txt index 9802c7a..bc4ce0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ if(WIN32) FetchContent_Declare( glfw GIT_REPOSITORY https://github.com/glfw/glfw.git - GIT_TAG 3.3.10 + GIT_TAG 3.4 ) set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE) @@ -78,8 +78,6 @@ else() pkg_check_modules(WAYLAND_CLIENT wayland-client) pkg_check_modules(WAYLAND_EGL wayland-egl) - include(CheckSymbolExists) - check_symbol_exists(glfwGetWaylandDisplay "GLFW/glfw3.h" GLFW_HAS_WAYLAND) endif() # ----------------------------- diff --git a/src/gui/main.cpp b/src/gui/main.cpp index a85cd9f..abc7609 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -1,7 +1,5 @@ #include -#define GLFW_EXPOSE_NATIVE_X11 -#define GLFW_EXPOSE_NATIVE_WAYLAND #include #include @@ -31,7 +29,17 @@ int main(int, char**) GLFWwindow* window = init_glfw(); if (!window) return 1; - printf("Using backend: %s\n", glfwGetVersionString()); + printf("GLFV Version: %s\n", glfwGetVersionString()); + + std::cout << "GLFW runtime platform: "; + switch (glfwGetPlatform()) { + case GLFW_PLATFORM_WAYLAND: std::cout << "Wayland\n"; break; + case GLFW_PLATFORM_X11: std::cout << "X11\n"; break; + case GLFW_PLATFORM_COCOA: std::cout << "Cocoa\n"; break; + case GLFW_PLATFORM_WIN32: std::cout << "Win32\n"; break; + default: std::cout << "Unknown\n"; + } + init_imgui(window, ini_path);