|
|
@@ -8,9 +8,9 @@ package("aui")
|
|
|
|
|
|
add_versions("v7.1.2", "a4cf965c50d75e20a319c9c8b231ad9c13c25a06ad303e1eb65d1ff141b1f85c")
|
|
|
|
|
|
- add_patches("v7.1.2", "patches/v7.1.2/debundle-audio.diff", "464d798caaf366f3fadb689504584ad38b15af05c4f044c74c8290a151b082d9")
|
|
|
- add_patches("v7.1.2", "patches/v7.1.2/debundle-build.diff", "92bfd68e28a703518c12cf51b898a6b75cacae1fec9384328562c47b003e9577")
|
|
|
- add_patches("v7.1.2", "patches/v7.1.2/debundle-core.diff", "0b3cf2140767e2f5232a3769301f1ca8af8c5e07ded55a8f8a98e627a597fd64")
|
|
|
+ add_patches("v7.1.2", "patches/v7.1.2/debundle-audio.diff", "a51f9b89b0ec4895b6d1f10c1259e0c620c8a0480817598de977210c0ad78e46")
|
|
|
+ add_patches("v7.1.2", "patches/v7.1.2/debundle-build.diff", "391d389da336dc24ddb37432ad85bcf9de3b956742157628e741a500733151cd")
|
|
|
+ add_patches("v7.1.2", "patches/v7.1.2/debundle-core.diff", "2ab1e7181d07b64bb059b8b7fdff69c295df84043560ecb337516c649ac28bbe")
|
|
|
add_patches("v7.1.2", "patches/v7.1.2/debundle-crypt.diff", "58045d168a8c7f2658554e0a3010579ec53b54e2c51f524a4fb61e5e4d6fc0a7")
|
|
|
add_patches("v7.1.2", "patches/v7.1.2/debundle-curl.diff", "937280a828ce0bc30a590606e7d65de55c9421d0650897c2d775e3731405a4b0")
|
|
|
add_patches("v7.1.2", "patches/v7.1.2/debundle-image.diff", "44bb7e78eab9629c92ef953ec1e0aca9e80712fe2488d6ffa804924d418ebf05")
|
|
|
@@ -18,11 +18,12 @@ package("aui")
|
|
|
add_patches("v7.1.2", "patches/v7.1.2/debundle-main.diff", "c1cac9dfbae14baaddb68837055a7a858c08786750a16cbbfe955a1f18e5878d")
|
|
|
add_patches("v7.1.2", "patches/v7.1.2/debundle-sqlite.diff", "1728a4b9afc473acc81b16c544239e6f70a147c0623d894d59dd124e27c94311")
|
|
|
add_patches("v7.1.2", "patches/v7.1.2/debundle-toolbox.diff", "1ec1abf993eb7e583d32602e1ae8ee4d3358d156e9fac185c0d19ed85660bd3b")
|
|
|
- add_patches("v7.1.2", "patches/v7.1.2/debundle-uitests.diff", "831a208eff22c5536ada4ea4a4e2496868977c2ee9b7d7e534bc6bdeae537d86")
|
|
|
- add_patches("v7.1.2", "patches/v7.1.2/debundle-views.diff", "b691b46fc425f7c497de18b77b4ad2ac62cf61c983688f2402a50d727770e28f")
|
|
|
+ add_patches("v7.1.2", "patches/v7.1.2/debundle-uitests.diff", "b7ad0900fbe2d8b50698f3439fe2fe6c182c925e94d72420ebb5104ba0f2f633")
|
|
|
+ add_patches("v7.1.2", "patches/v7.1.2/debundle-views.diff", "d889bbbd1808f12937219e5ca40b835cb972e6d764d021e4ec5444132a68a8a3")
|
|
|
add_patches("v7.1.2", "patches/v7.1.2/fix-backport-lunasvg.diff", "daf24391b88e44bdb801b2c1ba36a695f95384d8157ccb23cfc635d5f30bea4a")
|
|
|
add_patches("v7.1.2", "patches/v7.1.2/fix-msvc-pretty-function.diff", "268f66f42594f0188fe50d33f5783e66f66024087097ebfdfef60c9768e151fd")
|
|
|
- add_patches("v7.1.2", "patches/v7.1.2/fix-osx-enforce-cpp-template.diff", "eef4147a8b037552887777cd497c190ecc22514bb11fb3a3d6ea433a78cce61b")
|
|
|
+ add_patches("v7.1.2", "patches/v7.1.2/fix-osx-enforce-cpp-template.diff", "599e1e9ec9beec581258db67af8c9fe9dd2351eb169a538890c65422b5052659")
|
|
|
+ add_patches("v7.1.2", "patches/v7.1.2/fixup-network.diff", "888c1ed0e96f21bd842de72f8f9fe933261c5f76c99be55cf8e83f424bd1f79e")
|
|
|
|
|
|
add_deps("cmake")
|
|
|
if is_subhost("windows") then
|
|
|
@@ -32,13 +33,32 @@ package("aui")
|
|
|
end
|
|
|
add_deps("zlib")
|
|
|
|
|
|
+ add_links(
|
|
|
+ "aui.uitests",
|
|
|
+ "aui.audio",
|
|
|
+ "aui.json",
|
|
|
+ "aui.views",
|
|
|
+ "aui.xml",
|
|
|
+ "aui.image",
|
|
|
+ "aui.curl",
|
|
|
+ "aui.crypt",
|
|
|
+ "aui.network",
|
|
|
+ "aui.core"
|
|
|
+ )
|
|
|
+
|
|
|
+ on_check(function (package)
|
|
|
+ if package:is_cross() then
|
|
|
+ raise("package(aui): does not support cross-compilation now.")
|
|
|
+ end
|
|
|
+ end)
|
|
|
+
|
|
|
-- aui.audio
|
|
|
on_component("audio", function (package, component)
|
|
|
package:add("includedirs", "aui.audio/include")
|
|
|
component:add("links", "aui.audio")
|
|
|
package:add("deps", "libopus", "soxr")
|
|
|
if package:is_plat("linux") then
|
|
|
- component:add("syslinks", "pulse")
|
|
|
+ package:add("deps", "pulseaudio")
|
|
|
elseif package:is_plat("android") then
|
|
|
package:add("deps", "oboe")
|
|
|
elseif package:is_plat("windows", "mingw") then
|
|
|
@@ -58,7 +78,7 @@ package("aui")
|
|
|
package:add("deps", "fmt 9.1.0", "range-v3", "glm")
|
|
|
if package:is_plat("linux") then
|
|
|
package:add("deps", "libbacktrace")
|
|
|
- component:add("syslinks", "threads", "dl")
|
|
|
+ component:add("syslinks", "pthread", "dl")
|
|
|
elseif package:is_plat("windows", "mingw") then
|
|
|
component:add("syslinks", "dbghelp", "shell32", "shlwapi", "kernel32", "psapi")
|
|
|
elseif package:is_plat("android") then
|
|
|
@@ -129,13 +149,16 @@ package("aui")
|
|
|
package:add("deps", "libx11", "dbus", "gtk3", "fontconfig")
|
|
|
end
|
|
|
if package:is_plat("windows", "mingw") then
|
|
|
- component:add("syslinks", "dwmapi", "winmm", "shlwapi")
|
|
|
+ component:add("syslinks", "dwmapi", "winmm", "shlwapi", "gdi32", "ole32", "opengl32")
|
|
|
+ if package:is_plat("mingw") then
|
|
|
+ component:add("syslinks", "uuid")
|
|
|
+ end
|
|
|
elseif package:is_plat("android") then
|
|
|
component:add("syslinks", "EGL", "GLESv2", "GLESv3")
|
|
|
elseif package:is_plat("iphoneos") then
|
|
|
component:add("frameworks", "OpenGLES")
|
|
|
elseif package:is_plat("macosx") then
|
|
|
- component:add("frameworks", "AppKit", "Cocoa", "CoreData", "Foundation", "QuartzCore", "UniformTypeIdentifiers")
|
|
|
+ component:add("frameworks", "AppKit", "Cocoa", "CoreData", "Foundation", "QuartzCore", "UniformTypeIdentifiers", "OpenGL")
|
|
|
end
|
|
|
end)
|
|
|
|
|
|
@@ -151,28 +174,124 @@ package("aui")
|
|
|
package:add("defines", "AUI_STATIC")
|
|
|
end
|
|
|
package:add("defines", "AUI_DEBUG=" .. (package:is_debug() and "1" or "0"))
|
|
|
- package:add("defines", "API_AUI_CORE=AUI_IMPORT")
|
|
|
+ package:add("defines",
|
|
|
+ "API_AUI_AUDIO=AUI_IMPORT",
|
|
|
+ "API_AUI_CORE=AUI_IMPORT",
|
|
|
+ "API_AUI_CRYPT=AUI_IMPORT",
|
|
|
+ "API_AUI_CURL=AUI_IMPORT",
|
|
|
+ "API_AUI_DATA=AUI_IMPORT",
|
|
|
+ "API_AUI_IMAGE=AUI_IMPORT",
|
|
|
+ "API_AUI_JSON=AUI_IMPORT",
|
|
|
+ "API_AUI_NETWORK=AUI_IMPORT",
|
|
|
+ "API_AUI_UITESTS=AUI_IMPORT",
|
|
|
+ "API_AUI_UPDATER=AUI_IMPORT",
|
|
|
+ "API_AUI_VIEWS=AUI_IMPORT",
|
|
|
+ "API_AUI_XML=AUI_IMPORT"
|
|
|
+ )
|
|
|
+ ----------------------------------------------------------------
|
|
|
+ -- helper
|
|
|
+ ----------------------------------------------------------------
|
|
|
+ function add_flags(pkg, flags, names)
|
|
|
+ local defs = {}
|
|
|
+ for _, name in ipairs(names) do
|
|
|
+ local val = flags[name] or 0
|
|
|
+ defs[#defs+1] = string.format("%s=%d", name, val)
|
|
|
+ end
|
|
|
+ pkg:add("defines", table.unpack(defs))
|
|
|
+ end
|
|
|
+ ----------------------------------------------------------------
|
|
|
+ -- platform
|
|
|
+ ----------------------------------------------------------------
|
|
|
+ local platform_names = {
|
|
|
+ "AUI_PLATFORM_WIN",
|
|
|
+ "AUI_PLATFORM_LINUX",
|
|
|
+ "AUI_PLATFORM_APPLE",
|
|
|
+ "AUI_PLATFORM_MACOS",
|
|
|
+ "AUI_PLATFORM_IOS",
|
|
|
+ "AUI_PLATFORM_ANDROID",
|
|
|
+ "AUI_PLATFORM_UNIX",
|
|
|
+ "AUI_PLATFORM_EMSCRIPTEN"
|
|
|
+ }
|
|
|
+
|
|
|
+ local platform_map = {
|
|
|
+ windows = { AUI_PLATFORM_WIN = 1 },
|
|
|
+ linux = { AUI_PLATFORM_LINUX = 1, AUI_PLATFORM_UNIX = 1 },
|
|
|
+ macosx = { AUI_PLATFORM_APPLE = 1, AUI_PLATFORM_MACOS = 1, AUI_PLATFORM_UNIX = 1 },
|
|
|
+ android = { AUI_PLATFORM_ANDROID = 1, AUI_PLATFORM_UNIX = 1 },
|
|
|
+ iphoneos = { AUI_PLATFORM_APPLE = 1, AUI_PLATFORM_IOS = 1, AUI_PLATFORM_UNIX = 1 },
|
|
|
+ wasm = { AUI_PLATFORM_EMSCRIPTEN = 1 },
|
|
|
+ }
|
|
|
+
|
|
|
+ for key, flags in pairs(platform_map) do
|
|
|
+ local plats = (key == "windows") and {"windows", "mingw"} or {key}
|
|
|
+ if package:is_plat(table.unpack(plats)) then
|
|
|
+ add_flags(package, flags, platform_names)
|
|
|
+ break
|
|
|
+ end
|
|
|
+ end
|
|
|
+ ----------------------------------------------------------------
|
|
|
+ -- compiler
|
|
|
+ ----------------------------------------------------------------
|
|
|
+ local compiler_names = {
|
|
|
+ "AUI_COMPILER_CLANG",
|
|
|
+ "AUI_COMPILER_GCC",
|
|
|
+ "AUI_COMPILER_MSVC",
|
|
|
+ }
|
|
|
+
|
|
|
+ local compiler_map = {
|
|
|
+ clang = { tools = {"clang", "clangxx", "clang++"}, flags = { AUI_COMPILER_CLANG = 1 } },
|
|
|
+ gcc = { tools = {"gcc", "gxx", "g++" }, flags = { AUI_COMPILER_GCC = 1 } },
|
|
|
+ msvc = { tools = {"cl", "clang-cl" }, flags = { AUI_COMPILER_MSVC = 1 } },
|
|
|
+ }
|
|
|
+
|
|
|
+ for _, info in pairs(compiler_map) do
|
|
|
+ if package:has_tool("cxx", table.unpack(info.tools)) then
|
|
|
+ add_flags(package, info.flags, compiler_names)
|
|
|
+ break
|
|
|
+ end
|
|
|
+ end
|
|
|
+ ----------------------------------------------------------------
|
|
|
+ -- architecture
|
|
|
+ ----------------------------------------------------------------
|
|
|
+ local arch_names = {
|
|
|
+ "AUI_ARCH_X86",
|
|
|
+ "AUI_ARCH_X86_64",
|
|
|
+ "AUI_ARCH_ARM_64",
|
|
|
+ "AUI_ARCH_ARM_V7"
|
|
|
+ }
|
|
|
+
|
|
|
+ local ptrsize = package:check_sizeof("void*")
|
|
|
+ local arch_flags
|
|
|
+
|
|
|
+ if package:is_arch("arm.*") then
|
|
|
+ arch_flags = (ptrsize == "4")
|
|
|
+ and {AUI_ARCH_ARM_V7 = 1}
|
|
|
+ or {AUI_ARCH_ARM_64 = 1}
|
|
|
+ else
|
|
|
+ arch_flags = (ptrsize == "4")
|
|
|
+ and {AUI_ARCH_X86 = 1}
|
|
|
+ or {AUI_ARCH_X86_64 = 1}
|
|
|
+ end
|
|
|
+
|
|
|
+ add_flags(package, arch_flags, arch_names)
|
|
|
+
|
|
|
package:add("defines", "GLM_ENABLE_EXPERIMENTAL=1")
|
|
|
end)
|
|
|
|
|
|
- on_install("windows|!arm*", "macosx", function (package)
|
|
|
+ on_install("windows", "macosx", "linux", function (package)
|
|
|
local configs = {
|
|
|
"-DAUI_INSTALL_RUNTIME_DEPENDENCIES=OFF",
|
|
|
"-DAUIB_NO_PRECOMPILED=TRUE",
|
|
|
- "-DAUIB_DISABLE=ON"
|
|
|
+ "-DAUIB_DISABLE=ON",
|
|
|
}
|
|
|
local opt = {}
|
|
|
- if package:is_plat("macosx") then
|
|
|
- if package:config("shared") then
|
|
|
- opt.packagedeps = {"gtest"}
|
|
|
- end
|
|
|
- elseif package:is_plat("windows") then
|
|
|
- if package:config("shared") then
|
|
|
- opt.packagedeps = {"glew", "gtest"}
|
|
|
- end
|
|
|
+ if package:is_plat("windows", "mingw") then
|
|
|
if package:has_tool("cxx", "cl", "clang_cl") then
|
|
|
opt.cxflags = {"/EHsc"}
|
|
|
end
|
|
|
+ if package:targetarch():startswith("arm") then
|
|
|
+ io.replace("cmake/aui.build.cmake", [[if (CMAKE_GENERATOR_PLATFORM MATCHES "(arm64)|(ARM64)" OR CMAKE_SYSTEM_PROCESSOR MATCHES "(aarch64|arm64)")]], [[if (1)]], {plain = true})
|
|
|
+ end
|
|
|
end
|
|
|
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release"))
|
|
|
table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
|
|
|
@@ -181,12 +300,37 @@ package("aui")
|
|
|
|
|
|
on_test(function (package)
|
|
|
assert(package:check_cxxsnippets({test = [[
|
|
|
+ #include <AUI/Platform/AWindow.h>
|
|
|
+ #include <AUI/Util/UIBuildingHelpers.h>
|
|
|
+ #include <AUI/View/ALabel.h>
|
|
|
+ #include <AUI/View/AButton.h>
|
|
|
+ #include <AUI/Platform/APlatform.h>
|
|
|
#include <AUI/Platform/Entry.h>
|
|
|
- #include <AUI/Logging/ALogger.h>
|
|
|
- #include <AUI/Common/AByteBuffer.h>
|
|
|
- #include <AUI/Url/AUrl.h>
|
|
|
+ using namespace declarative;
|
|
|
+ class MainWindow: public AWindow {
|
|
|
+ public:
|
|
|
+ MainWindow();
|
|
|
+ };
|
|
|
+ MainWindow::MainWindow(): AWindow("Project template app", 300_dp, 200_dp) {
|
|
|
+ setContents(
|
|
|
+ Centered{
|
|
|
+ Vertical{
|
|
|
+ Centered { Label { "Hello world from AUI!" } },
|
|
|
+ _new<AButton>("Visit GitHub repo").connect(&AView::clicked, this, [] {
|
|
|
+ APlatform::openUrl("https://github.com/aui-framework/aui");
|
|
|
+ }),
|
|
|
+ _new<AButton>("Visit docs").connect(&AView::clicked, this, [] {
|
|
|
+ APlatform::openUrl("https://aui-framework.github.io/");
|
|
|
+ }),
|
|
|
+ _new<AButton>("Submit an issue").connect(&AView::clicked, this, [] {
|
|
|
+ APlatform::openUrl("https://github.com/aui-framework/aui/issues/new");
|
|
|
+ }),
|
|
|
+ }
|
|
|
+ }
|
|
|
+ );
|
|
|
+ }
|
|
|
void test() {
|
|
|
- auto buf = AByteBuffer::fromStream(AUrl(":test.txt").open());
|
|
|
+ _new<MainWindow>()->show();
|
|
|
}
|
|
|
]]}, {configs = {languages = "c++20"}}))
|
|
|
end)
|
Saikari