hashirama/gd-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request 'Fixed cmake on fedora removed segfault' (#4) from xieamoe/gd-tools-plus:main into main

Browse source 
Reviewed-on: https://codeberg.org/hashirama/gd-tools/pulls/4
This commit is contained in:
千住柱間 2024-02-29 21:47:35 +00:00
parent a374b08400 2dd37bef9b
commit d3eb63b2ce
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -115,7 +115,7 @@ endif()
#Apple and other
if (NOT ${GUIX})
target_link_libraries(gd-tools_exe PRIVATE marisa cpr::cpr nlohmann_json::nlohmann_json rdricpp::rdricpp)
target_link_libraries(gd-tools_exe PRIVATE marisa cpr::cpr nlohmann_json::nlohmann_json rdricpp)
endif()
# ---- Install rules ----

1
cmake/dev-mode.cmake
View file

@ -6,6 +6,7 @@ if ( (NOT ${GUIX}) )
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
GIT_TAG v3.5.2)
FetchContent_MakeAvailable(catch)
include(Catch)
endif() #Adds Catch2::Catch2
include(CTest)

27
src/main.cpp
View file

@ -164,21 +164,22 @@ auto main(/*int const argc, char const* const* const argv*/) -> int
#ifndef WIN32 //General Main
auto main(int const argc, char const* const* const argv) -> int
{
std::vector<std::string_view> args{};
for(int i{0}; i < argc; i++)
args.push_back(argv[i]);
if(argc > 1){
//Automatically change font for handwritten
std::string_view font = "--font-family";
std::string_view font_value = "armedlemon";
if(std::string(argv[1]) == "handwritten" || base_name(argv[0]) == "gd-handwritten" && argc > 2){
args.push_back(font);
args.push_back(font_value);
}
std::vector<std::string_view> args{};
for(int i{0}; i < argc; i++)
args.push_back(argv[i]);
take_action(args);
//Automatically change font for handwritten
std::string_view font = "--font-family";
std::string_view font_value = "armedlemon";
if(std::string(argv[1]) == "handwritten" || base_name(argv[0]) == "gd-handwritten" && argc > 2){
args.push_back(font);
args.push_back(font_value);
}
//Original code
//take_action(std::vector<std::string_view>{ argv, std::next(argv, argc) });
take_action(args);
}else
take_action(std::vector<std::string_view>{ argv, std::next(argv, argc) });
}
#endif //General Main