- Fixed macOS / Linux compile

- Updated CMakeLists.txt to copy themes to bin directory, and also the install
  dir.
This commit is contained in:
Casey Langen 2017-03-12 19:03:08 -07:00
parent a90bd2eec7
commit 3d7f36a975
2 changed files with 11 additions and 1 deletions

View File

@ -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}

View File

@ -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;