From 43da2c7ac186994fad471f8f2518fa672eb4e374 Mon Sep 17 00:00:00 2001 From: "Ethan J. Hadley" Date: Sun, 30 Aug 2026 12:49:32 -0600 Subject: [PATCH] Working on windows with https --- CMakeLists.txt | 10 +++------- cmake/windows-x86_64-toolchain.cmake | 11 +++++++++++ src/main.cpp | 4 ++-- winrun.sh | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 cmake/windows-x86_64-toolchain.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e20147..711e785 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,9 @@ target_include_directories(YTMusicDL26 PUBLIC include(cmake/CPM.cmake) set(CURL_USE_LIBPSL OFF CACHE BOOL "" FORCE) +set(CURL_USE_SCHANNEL ON) + +set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE) CPMAddPackage("gh:nlohmann/json#v3.12.0") CPMAddPackage("gh:curl/curl#curl-8_21_0") @@ -38,13 +41,6 @@ if (WIN32) -static-libstdc++ -static ) - - add_custom_command(TARGET YTMusicDL26 POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - $ - $ - COMMAND_EXPAND_LISTS - ) endif () diff --git a/cmake/windows-x86_64-toolchain.cmake b/cmake/windows-x86_64-toolchain.cmake new file mode 100644 index 0000000..a8cee27 --- /dev/null +++ b/cmake/windows-x86_64-toolchain.cmake @@ -0,0 +1,11 @@ +set(CMAKE_SYSTEM_NAME Windows) +set(CMAKE_SYSTEM_PROCESSOR x86_64) + +set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc) +set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++) + +set(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32) + +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) diff --git a/src/main.cpp b/src/main.cpp index 15537ef..3c825ea 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -57,13 +57,13 @@ auto main(int argc, char* argv[]) -> int { if (!content->rip(musicDir, [&content, &urls](int percent) { if (percent == 0) { - printf("\rGathering info... (this may take awhile)"); + printf("\r\033[KGathering info... (this may take a while)"); fflush(stdout); } else { std::string artist; std::string album; content->info(artist, album); - printf("\r%s by %s at %d%%", album.c_str(), artist.c_str(), percent); + printf("\r\033[K%s by %s at %d%%", album.c_str(), artist.c_str(), percent); fflush(stdout); } })) { diff --git a/winrun.sh b/winrun.sh index 8f54b1c..f259b52 100644 --- a/winrun.sh +++ b/winrun.sh @@ -1,6 +1,6 @@ mkdir build cd build -cmake -DCMAKE_TOOLCHAIN_FILE=~/TC-mingw.cmake -GNinja .. +cmake -DCMAKE_TOOLCHAIN_FILE=cmake/windows-x86_64-toolchain.cmake -GNinja .. ninja wine YTMusicDL26.exe cd ..