aboutsummaryrefslogtreecommitdiff
path: root/ports/ogre
diff options
context:
space:
mode:
authornicole mazzuca <mazzucan@outlook.com>2020-08-02 10:08:07 -0700
committerGitHub <noreply@github.com>2020-08-02 10:08:07 -0700
commit1c2af994151fb3e177df54f89223b056ecddbcec (patch)
tree263cdf1db448c2a0610191922c7c6036c4a4b366 /ports/ogre
parentc0f23c6c31ea7af5a751ea48a043dc64a872f4a0 (diff)
downloadvcpkg-1c2af994151fb3e177df54f89223b056ecddbcec.tar.gz
vcpkg-1c2af994151fb3e177df54f89223b056ecddbcec.zip
[vcpkg format-manifest] Add convert-control flag (#12471)
* [vcpkg format-manifest] initial convert-control attempt TODO: manifest comments! we should keep $directives * Finalize x-format-manifest First, fix Json::parse -- "\c", for any c, was incorrectly parsed. It would emit the escaped character, and then parse the character, so that `\b` would give you { '\b', 'b' }. Second, canonicalize source paragraphs as we're parsing them. This found an error in qt5 -- The `declarative` feature was listed twice, and we now catch it, so I removed the second paragraph. Add PlatformExpression::complexity to allow ordering platform expressions in a somewhat reasonable way. Notes: - We allow `all_modules` as a feature name for back-compat with paraview - In order to actually convert CONTROL to vcpkg.json, we'd need to rename the qt5 `default` feature. - We need to add support for $directives in x-format-manifest * fix qt5 port * format * fix compile * fix tests for canonicalization * Clean up code * add error message for nothing to format * add extra_info field * add `const X&` overloads for `Object::insert[_or_replace]` * fix compile * simple CRs * add tests * format * Fix mosquitto port file also unmerge a line * fail the tests on malformed manifest * fix format_all * fix coroutine port-version * format manifests
Diffstat (limited to 'ports/ogre')
-rw-r--r--ports/ogre/vcpkg.json18
1 files changed, 9 insertions, 9 deletions
diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json
index d7f0fa276..133fb3cfb 100644
--- a/ports/ogre/vcpkg.json
+++ b/ports/ogre/vcpkg.json
@@ -6,27 +6,27 @@
"dependencies": [
"freeimage",
"freetype",
- "zlib",
- "zziplib",
- "sdl2",
- "pugixml",
{
"name": "imgui",
"features": [
"freetype"
]
- }
+ },
+ "pugixml",
+ "sdl2",
+ "zlib",
+ "zziplib"
],
"features": [
{
- "name": "d3d9",
- "description": "Build Direct3D9 RenderSystem"
- },
- {
"name": "csharp",
"description": "Build csharp bindings"
},
{
+ "name": "d3d9",
+ "description": "Build Direct3D9 RenderSystem"
+ },
+ {
"name": "java",
"description": "Build Java (JNI) bindings"
},