Skip to content

Commit 692e254

Browse files
committed
add eastl 3.27.00 and add an alternate url for eabase to fetch matching commit
1 parent 9ed5fdc commit 692e254

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

packages/e/eabase/xmake.lua

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ package("eabase")
44
set_description("EABase is a small set of header files that define platform-independent data types and platform feature macros.")
55
set_license("BSD-3-Clause")
66

7-
add_urls("https://github.com/electronicarts/EABase/archive/refs/tags/$(version).tar.gz",
8-
"https://github.com/electronicarts/EABase.git")
7+
add_urls("https://github.com/electronicarts/EABase/archive/refs/tags/$(version).tar.gz")
8+
add_urls("https://github.com/electronicarts/EABase.git", {alias = "git", submodules = false})
99

1010
add_versions("2.09.05", "f85b98c96f1976aa013c8d6016c5e37a409633ac3fce843cd4ec0b89c67e6b7a")
1111
add_patches("2.09.05", "patches/2.09.05/add-arm64-windows.patch", "c140e4587fdb1fc93b16df639da93aac5d331420b86f68363482be31f4bd2bfd")
12+
13+
add_versions("git:2.09.12", "0699a15efdfd20b6cecf02153bfa5663decb653c")
1214

1315
on_install("!wasm", function (package)
1416
os.cp("include/Common/EABase", package:installdir("include"))

packages/e/eastl/xmake.lua

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,33 @@ package("eastl")
1010
add_versions("3.17.06", "9ebeef26cdf091877ee348450d2711cd0bb60ae435309126c0adf8fec9a01ea5")
1111
add_versions("3.18.00", "a3c5b970684be02e81fb16fbf92ed2584e055898704fde87c72d0331afdea12b")
1212
add_versions("3.21.12", "2a4d77e5eda23ec52fea8b22abbf2ea8002f38396d2a3beddda3ff2e17f7db2e")
13+
add_versions("3.21.23", "2bcb48f88f7daf9f91c165aae751c10d11d6959b6e10f2dda8f1db893e684022")
14+
add_versions("3.27.00", "5606643e41ab12fd7c209755fe04dca581ed01f43dec515288b1544eea22623f")
1315

1416
add_deps("cmake")
1517
add_deps("eabase")
1618

19+
on_load("windows", function (package)
20+
if package:config("shared") then
21+
package:add("defines", "EA_DLL")
22+
end
23+
end)
24+
1725
on_install("windows", "linux", "macosx", function (package)
26+
io.replace("CMakeLists.txt", [[target_compile_features(EASTL PUBLIC cxx_std_14)]], [[target_compile_features(EASTL PUBLIC cxx_std_17)]], {plain = true})
27+
if package:is_plat("windows") and package:config("shared") then
28+
io.replace("CMakeLists.txt", [[add_definitions(-D_CHAR16T)]], [[add_definitions(-D_CHAR16T)
29+
if(BUILD_SHARED_LIBS)
30+
target_compile_definitions(EASTL PUBLIC EA_DLL)
31+
if(MSVC OR CYGWIN)
32+
target_compile_definitions(EASTL PRIVATE "EASTL_API=__declspec(dllexport)")
33+
endif()
34+
endif()]], {plain = true})
35+
end
1836
io.replace("CMakeLists.txt", "add_subdirectory(test/packages/EABase)", "", {plain = true})
1937
io.replace("CMakeLists.txt", "target_link_libraries(EASTL EABase)", "", {plain = true})
2038
local configs = {"-DEASTL_BUILD_TESTS=OFF", "-DEASTL_BUILD_BENCHMARK=OFF"}
21-
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
39+
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release"))
2240
if not package:is_plat("windows") then
2341
table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
2442
end

0 commit comments

Comments
 (0)