Skip to content

Fix compile on windows with clang #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nikitalita wants to merge 2 commits into from
Closed

Fix compile on windows with clang #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a94f90a
Fix compile on windows with clang
nikitalita Jan 28, 2023
c1d2beb
update gitignore
nikitalita Feb 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,12 @@ Thumbs.db
# Build directory
# ---------------
build/*

# generated config
config.h

# clangd cache
.cache/

# VScode IDE files
.vscode/
6 changes: 5 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,9 @@ add_executable (unshieldv3
ISArchiveV3.cpp
blast.c
)
target_link_libraries(unshieldv3 stdc++fs)

target_link_libraries(unshieldv3)
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
Copy link

@fabiangreffrath fabiangreffrath Sep 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't even required with the latest GCC anymore.

target_link_libraries(stdc++fs)
endif()
install(TARGETS unshieldv3)
6 changes: 5 additions & 1 deletion ISArchiveV3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ limitations under the License.
#include "ISArchiveV3.h"
#include <algorithm>
#include <cassert>
#include <sstream>
#include <string>
#include <iostream>
#include <exception>
extern "C" {
Expand Down Expand Up @@ -111,8 +113,10 @@ std::tm ISArchiveV3::File::tm() const {

std::filesystem::path ISArchiveV3::File::path() const {
std::string fp = full_path;
// windows paths are wchar_t, convert
char pref_seperator = fs::path::preferred_separator;
std::replace(fp.begin(), fp.end(),
'\\', fs::path::preferred_separator);
'\\', pref_seperator);
return std::filesystem::path(fp);
}

Expand Down
4 changes: 2 additions & 2 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ void info(const ISArchiveV3& archive) {
}
}

void list(const ISArchiveV3& archive, bool verbose = false) {
void list_archive(const ISArchiveV3& archive, bool verbose = false) {
size_t max_path = 0;
if (verbose) {
for (auto& f : archive.files()) {
Expand Down Expand Up @@ -161,7 +161,7 @@ int cmd_list(deque<string> subargs) {
return 1;
}
ISArchiveV3 archive(apath);
list(archive, verbose);
list_archive(archive, verbose);
return 0;
}

Expand Down