merge directxtk

pull/119/head
ruki 4 years ago
parent 9e7d5ae1d3
commit e93adcdcdb
No known key found for this signature in database
GPG Key ID: 809EF06AD42725BD
  1. 2
      .github/workflows/windows.yml
  2. 42
      packages/d/directxtk/xmake.lua
  3. 4
      scripts/test.lua

@ -21,5 +21,5 @@ jobs:
- name: Tests - name: Tests
run: | run: |
xmake l ./scripts/test.lua -D -k ${{ matrix.kind }} xmake l ./scripts/test.lua -D -k ${{ matrix.kind }} --vs_sdkver=10.0.19041.0

@ -0,0 +1,42 @@
package("DirectXTK")
set_homepage("https://github.com/microsoft/DirectXTK")
set_description("This package contains the \"DirectX Tool Kit\", a collection of helper classes for writing Direct3D 11 C++ code for Universal Windows Platform (UWP) apps for Windows 10, Xbox One, and Win32 desktop applications for Windows 7 Service Pack 1 or later.")
set_urls("https://github.com/microsoft/DirectXTK/archive/$(version).zip",
"https://github.com/microsoft/DirectXTK.git",
{version = function (version)
local versions = {
["20.9.0"] = "sept2020"
}
return versions[version]
end})
add_versions("20.9.0", "9d5131243bf3e33db2e3a968720d860abdcbbe7cb037c2cb5dd06046d439ed09")
on_install("windows", function (package)
local configs = {}
local vs_sdkver = get_config("vs_sdkver")
if vs_sdkver then
local build_ver = string.match(vs_sdkver, "%d+%.%d+%.(%d+)%.?%d*")
assert(tonumber(build_ver) >= 19041, "DirectXTK requires Windows SDK to be at least 10.0.19041.0")
table.insert(configs, "-DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=" .. vs_sdkver)
table.insert(configs, "-DCMAKE_SYSTEM_VERSION=" .. vs_sdkver)
end
table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
import("package.tools.cmake").install(package, configs)
os.cp("Inc/*", package:installdir("include"))
end)
on_test(function (package)
assert(package:check_cxxsnippets({test = [[
void test()
{
DirectX::SimpleMath::Vector3 eye(0.0f, 0.7f, 1.5f);
DirectX::SimpleMath::Vector3 at(0.0f, -0.1f, 0.0f);
auto lookAt = DirectX::SimpleMath::Matrix::CreateLookAt(eye, at, DirectX::SimpleMath::Vector3::UnitY);
}
]]}, {configs = {languages = "c++11"}, includes = { "SimpleMath.h" } }))
end)

@ -18,6 +18,7 @@ local options =
, {nil, "ldflags", "kv", nil, "Set the ldflags." } , {nil, "ldflags", "kv", nil, "Set the ldflags." }
, {nil, "ndk", "kv", nil, "Set the android NDK directory." } , {nil, "ndk", "kv", nil, "Set the android NDK directory." }
, {nil, "sdk", "kv", nil, "Set the SDK directory of cross toolchain." } , {nil, "sdk", "kv", nil, "Set the SDK directory of cross toolchain." }
, {nil, "vs_sdkver", "kv", nil, "Set the Windows SDK version." }
, {nil, "mingw", "kv", nil, "Set the MingW directory." } , {nil, "mingw", "kv", nil, "Set the MingW directory." }
, {nil, "packages", "vs", nil, "The package list." } , {nil, "packages", "vs", nil, "The package list." }
} }
@ -47,6 +48,9 @@ function _require_packages(argv, packages)
if argv.sdk then if argv.sdk then
table.insert(config_argv, "--sdk=" .. argv.sdk) table.insert(config_argv, "--sdk=" .. argv.sdk)
end end
if argv.vs_sdkver then
table.insert(config_argv, "--vs_sdkver=" .. argv.vs_sdkver)
end
if argv.mingw then if argv.mingw then
table.insert(config_argv, "--mingw=" .. argv.mingw) table.insert(config_argv, "--mingw=" .. argv.mingw)
end end

Loading…
Cancel
Save