Skip to content
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

Avoid C4819 warning during bootstrap-vcpkg.bat #15095

Merged
merged 2 commits into from
Dec 14, 2020
Merged

Avoid C4819 warning during bootstrap-vcpkg.bat #15095

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
fc52e8c
Avoid C4819 warning during bootstrap-vcpkg.bat
tetsuh Dec 13, 2020
9e2eba5
clang-format
Dec 14, 2020
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
52 changes: 26 additions & 26 deletions toolsrc/src/vcpkg/export.prefab.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,32 +335,32 @@ namespace vcpkg::Export::Prefab

/*
prefab
└── <name>
├── aar
│   ├── AndroidManifest.xml
│   ├── META-INF
│   │   └── LICENCE
│   └── prefab
│   ├── modules
│   │   └── <module>
│   │   ├── include
│   │   ├── libs
│   │   │   ├── android.arm64-v8a
│   │   │   │   ├── abi.json
│   │   │   │   └── lib<module>.so
│   │   │   ├── android.armeabi-v7a
│   │   │   │   ├── abi.json
│   │   │   │   └── lib<module>.so
│   │   │   ├── android.x86
│   │   │   │   ├── abi.json
│   │   │   │   └── lib<module>.so
│   │   │   └── android.x86_64
│   │   │   ├── abi.json
│   │   │   └── lib<module>.so
│   │   └── module.json
│   └── prefab.json
├── <name>-<version>.aar
└── pom.xml
+-- <name>
+-- aar
| +-- AndroidManifest.xml
| +-- META-INF
| | +-- LICENCE
| +-- prefab
| +-- modules
| | +-- <module>
| | +-- include
| | +-- libs
| | | +-- android.arm64-v8a
| | | | +-- abi.json
| | | | +-- lib<module>.so
| | | +-- android.armeabi-v7a
| | | | +-- abi.json
| | | | +-- lib<module>.so
| | | +-- android.x86
| | | | +-- abi.json
| | | | +-- lib<module>.so
| | | +-- android.x86_64
| | | +-- abi.json
| | | +-- lib<module>.so
| | +-- module.json
| +-- prefab.json
+-- <name>-<version>.aar
+-- pom.xml
*/

std::unordered_map<std::string, std::string> version_map;
Expand Down
3 changes: 2 additions & 1 deletion toolsrc/src/vcpkg/registries.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,8 @@ namespace
fs::path path_to_registry_database(const VcpkgPaths& paths) const
{
fs::path path_to_db = paths.config_root_dir / path;
path_to_db /= fs::u8path({'\xF0', '\x9F', '\x98', '\x87'}); // utf-8 for 😇
path_to_db /= fs::u8path(
{'\xF0', '\x9F', '\x98', '\x87'}); // utf-8 for https://emojipedia.org/smiling-face-with-halo/
return path_to_db;
}

Expand Down