From 371e816e7cdec287097da3e71c93e52e3c90405f Mon Sep 17 00:00:00 2001 From: Kyle Benesch <4b796c65+github@gmail.com> Date: Sun, 16 Oct 2022 20:56:55 -0700 Subject: [PATCH 1/2] Update to 3.1.0. Options no longer have `_LIBS`. --- ports/flecs/portfile.cmake | 8 ++++---- ports/flecs/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/flecs.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/flecs/portfile.cmake b/ports/flecs/portfile.cmake index 334b359d876a79..bb71c1eb022cd5 100644 --- a/ports/flecs/portfile.cmake +++ b/ports/flecs/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SanderMertens/flecs - REF v2.4.8 - SHA512 4d4ee41a457f6e13b5913bbc12f66dc9a3bcab3f39ad398da55892bb80649cf416d82255f17bbcef4fee11992028cbb2972d0e9e435435cb58a7b33ec2ebe526 + REF v3.1.0 + SHA512 422458818e4696359a2e0a3cf52b6d47b4fcfe792b483903cba9d0aad2beee574d1040b0d6286e158145226c8bb9ad897dd74cb87c9e3def0d89cb33e218b20d HEAD_REF master ) @@ -12,8 +12,8 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" FLECS_SHARED_LIBS) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DFLECS_STATIC_LIBS=${FLECS_STATIC_LIBS} - -DFLECS_SHARED_LIBS=${FLECS_SHARED_LIBS} + -DFLECS_STATIC=${FLECS_STATIC_LIBS} + -DFLECS_SHARED=${FLECS_SHARED_LIBS} ) vcpkg_cmake_install() diff --git a/ports/flecs/vcpkg.json b/ports/flecs/vcpkg.json index 1a4caa15038a20..0d94e103411639 100644 --- a/ports/flecs/vcpkg.json +++ b/ports/flecs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "flecs", - "version": "2.4.8", + "version": "3.1.0", "description": "A fast entity component system (ECS) for C & C++", "homepage": "https://github.com/SanderMertens/flecs", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 4a83e07b5286a4..7fa4a02553ab92 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2341,7 +2341,7 @@ "port-version": 0 }, "flecs": { - "baseline": "2.4.8", + "baseline": "3.1.0", "port-version": 0 }, "flint": { diff --git a/versions/f-/flecs.json b/versions/f-/flecs.json index 11314d32aa0389..9ed8b11007f484 100644 --- a/versions/f-/flecs.json +++ b/versions/f-/flecs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4314d3d650789e5c2470d8babace800c9b67bde5", + "version": "3.1.0", + "port-version": 0 + }, { "git-tree": "c39673b97267a414e46e47f526b48ca9c6b3b246", "version": "2.4.8", From cdf7f0e1bf5845d1e6c6f239957b11ad3267c99b Mon Sep 17 00:00:00 2001 From: Kyle Benesch <4b796c65+github@gmail.com> Date: Sun, 16 Oct 2022 21:40:52 -0700 Subject: [PATCH 2/2] Removed explicit non-support of UWP. --- ports/flecs/vcpkg.json | 1 - versions/f-/flecs.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/flecs/vcpkg.json b/ports/flecs/vcpkg.json index 0d94e103411639..6150da92dc2d82 100644 --- a/ports/flecs/vcpkg.json +++ b/ports/flecs/vcpkg.json @@ -4,7 +4,6 @@ "description": "A fast entity component system (ECS) for C & C++", "homepage": "https://github.com/SanderMertens/flecs", "license": "MIT", - "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/f-/flecs.json b/versions/f-/flecs.json index 9ed8b11007f484..30a9b6163fe754 100644 --- a/versions/f-/flecs.json +++ b/versions/f-/flecs.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4314d3d650789e5c2470d8babace800c9b67bde5", + "git-tree": "3b287c3496003f022bc0c1c2d55a775ac591d6e8", "version": "3.1.0", "port-version": 0 },