Skip to content

Fix relative paths, again #418

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

Merged
merged 17 commits into from
May 9, 2025
Merged

Fix relative paths, again #418

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c912799
Revert "Revert "fix: use both absolute and relative header paths in h…
Feb 16, 2025
702e6af
fix: omit duplicated startsWith() definition
Feb 16, 2025
654a64b
fix: convert windows TCHAR* to char* correctly
Feb 16, 2025
0303122
fix: add missing windows string conversion header
Feb 16, 2025
4b19818
fix: use CW2A instead of the obsolete CT2CA for windows string conver…
Feb 16, 2025
1b6d1a8
fix: include atlconv.h before windows.h
Feb 16, 2025
1ff90af
fix: windows string conversion again
Feb 16, 2025
1dc8c77
fix: use #ifdef _UNICODE in windows
Feb 16, 2025
e0efd63
typo fix
Feb 16, 2025
ea0627d
call `simplecpp::simplifyPath()` before returning the result in `toAb…
Tal500 Feb 24, 2025
477705f
join the _ trick party
Mar 20, 2025
b1c32a9
Merge branch 'fix-relative-paths2' of https://github.com/Tal500/simpl…
Mar 20, 2025
6167676
Merge branch 'danmar:master' into fix-relative-paths2
Tal500 Mar 20, 2025
b90d5c5
fix OS calc of current directory and fix windows headers inclusion
Apr 7, 2025
26fe250
Merge branch 'master' into fix-relative-paths2
danmar May 9, 2025
51d1e6f
Update CI-unixish.yml: trying to not upgrade pip
Tal500 May 9, 2025
6797a29
Update CI-windows.yml: returning Python installation
Tal500 May 9, 2025
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
Prev Previous commit
Next Next commit
fix: windows string conversion again
  • Loading branch information
Tal Hadad committed Feb 16, 2025
commit 1ff90af85cb9746a31ab8b238b0b23dd10354051
5 changes: 3 additions & 2 deletions simplecpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
#include <vector>

#ifdef SIMPLECPP_WINDOWS
#include <atlconv.h>
#include <windows.h>
#undef ERROR
#else
Expand Down Expand Up @@ -2689,7 +2688,9 @@ static std::string currentDirectoryOSCalc() {
#ifdef SIMPLECPP_WINDOWS
TCHAR NPath[MAX_PATH];
GetCurrentDirectory(MAX_PATH, NPath);
CW2A NPathA(NPath);
// convert the result from TCHAR* to char*
char NPathA[MAX_PATH];
::WideCharToMultiByte(CP_ACP, 0, NPath, lstrlen(NPath), NPathA, MAX_PATH, NULL, NULL);
return NPathA;
#else
const std::size_t size = 1024;
Expand Down