drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

[nostalgia] Fix for Windows

Browse Source
This commit is contained in:
Gary Talent 2022-12-17 13:37:37 -06:00
parent 4077f0bddc
commit d8153e71e1
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nostalgia/player/CMakeLists.txt
View File

@ -5,7 +5,9 @@ add_executable(
) )
# enable LTO # enable LTO
set_property(TARGET nostalgia PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) if(NOT WIN32)
set_property(TARGET nostalgia PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
endif()
if(COMMAND OBJCOPY_FILE) if(COMMAND OBJCOPY_FILE)
set_target_properties(nostalgia set_target_properties(nostalgia

4
src/nostalgia/studio/CMakeLists.txt
View File

@ -19,7 +19,7 @@ target_link_libraries(
NostalgiaCore-Studio NostalgiaCore-Studio
) )
if (CMAKE_BUILD_TYPE STREQUAL "Release") if(CMAKE_BUILD_TYPE STREQUAL "Release" AND NOT WIN32)
# enable LTO # enable LTO
set_property(TARGET nostalgia-studio PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) set_property(TARGET nostalgia-studio PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
endif() endif()
@ -43,4 +43,4 @@ install(
BUNDLE DESTINATION . BUNDLE DESTINATION .
) )
add_subdirectory(lib) add_subdirectory(lib)

2
src/nostalgia/studio/lib/configio.hpp
View File

@ -31,7 +31,7 @@ constexpr auto ConfigDir = [] {
case ox::OS::OpenBSD: case ox::OS::OpenBSD:
return "{}/.config/{}"; return "{}/.config/{}";
case ox::OS::Windows: case ox::OS::Windows:
return "{}/AppData/Local/{}"; return R"({}/AppData/Local/{})";
case ox::OS::BareMetal: case ox::OS::BareMetal:
return ""; return "";
} }

1
src/nostalgia/studio/lib/filedialog_nfd.cpp
View File

@ -36,7 +36,6 @@ ox::Result<ox::String> saveFile(const ox::Vector<FDFilterItem> &filters) noexcep
for (auto i = 0u; const auto &f : filters) { for (auto i = 0u; const auto &f : filters) {
filterItems[i].name = f.name.c_str(); filterItems[i].name = f.name.c_str();
filterItems[i].spec = f.spec.c_str(); filterItems[i].spec = f.spec.c_str();
//filterItems[i] = {f.name.c_str(), f.spec.c_str()};
++i; ++i;
} }
return toResult(NFD::SaveDialog(path, filterItems.data(), filterItems.size()), path); return toResult(NFD::SaveDialog(path, filterItems.data(), filterItems.size()), path);

2
src/nostalgia/tools/CMakeLists.txt
View File

@ -6,7 +6,7 @@ target_link_libraries(
NostalgiaPack NostalgiaPack
) )
if (CMAKE_BUILD_TYPE STREQUAL "Release") if(CMAKE_BUILD_TYPE STREQUAL "Release" AND NOT WIN32)
# enable LTO # enable LTO
set_property(TARGET nost-pack PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) set_property(TARGET nost-pack PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
endif() endif()