From a702285ba93fd8266f9cedbeaadea0b9dbf50bb2 Mon Sep 17 00:00:00 2001 From: casey langen Date: Sat, 24 Dec 2022 19:23:54 -0800 Subject: [PATCH] Haiku bug fixes. --- src/musikcore/support/Common.cpp | 2 +- src/musikcube/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/musikcore/support/Common.cpp b/src/musikcore/support/Common.cpp index f47043b82..ee246c15e 100644 --- a/src/musikcore/support/Common.cpp +++ b/src/musikcore/support/Common.cpp @@ -142,7 +142,7 @@ namespace musik { namespace core { if (ii.type == B_APP_IMAGE) { if (strlen(ii.name)) { std::string fn(ii.name); - result = fs::u8path(fn).parent_path().u8string(); + result = fs::u8path(fn).u8string(); } } } diff --git a/src/musikcube/CMakeLists.txt b/src/musikcube/CMakeLists.txt index e92789a2c..46d1532fe 100644 --- a/src/musikcube/CMakeLists.txt +++ b/src/musikcube/CMakeLists.txt @@ -104,7 +104,7 @@ if (APPLE) set(PANEL_LIBRARY_NAME "lib${PANEL_LIBRARY_NAME}.a") endif() else() - if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD") + if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD" OR CMAKE_SYSTEM_NAME MATCHES "Haiku") message(STATUS "[ncurses] detected OpenBSD, unsetting LIBTINFO") set(LIBTINFO "") else()