From 3d7f36a9756a9b1b36073793ad01926162bf5aa3 Mon Sep 17 00:00:00 2001 From: Casey Langen Date: Sun, 12 Mar 2017 19:03:08 -0700 Subject: [PATCH] - Fixed macOS / Linux compile - Updated CMakeLists.txt to copy themes to bin directory, and also the install dir. --- CMakeLists.txt | 10 ++++++++++ src/musikbox/cursespp/Colors.cpp | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 58bf2cf2f..4af2b26be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,6 +141,16 @@ else (CMAKE_SYSTEM_NAME MATCHES "Linux") endif (CMAKE_SYSTEM_NAME MATCHES "Linux") file(GLOB sdk_headers "src/core/sdk/*.h") +file(GLOB themes "src/musikbox/data/themes/*.json") + +file(COPY ${themes} + DESTINATION bin/themes +) + +install( + FILES ${themes} + DESTINATION share/musikcube/themes +) install( FILES ${sdk_headers} diff --git a/src/musikbox/cursespp/Colors.cpp b/src/musikbox/cursespp/Colors.cpp index 344ee2b97..e8c60eff2 100755 --- a/src/musikbox/cursespp/Colors.cpp +++ b/src/musikbox/cursespp/Colors.cpp @@ -228,7 +228,7 @@ struct Theme { std::wstring u16fn = u8to16(fn); FILE* file = _wfopen(u16fn.c_str(), L"rb"); #else - FILE* file = fopen(fn, "rb"); + FILE* file = fopen(fn.c_str(), "rb"); #endif if (!file) { return false;