Skip to content

Commit b9cefca

Browse files
committed
fixup
1 parent c16d684 commit b9cefca

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

packages/a/aui/patches/v7.1.2/debundle.diff

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ index 6902d56a..98ebd001 100644
3131
# [configure file example]
3232
configure_file(cmake/aui-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/aui-config.cmake @ONLY)
3333
diff --git a/aui.audio/CMakeLists.txt b/aui.audio/CMakeLists.txt
34-
index 21e44153..ddc655a1 100644
34+
index 21e44153..c3843c84 100644
3535
--- a/aui.audio/CMakeLists.txt
3636
+++ b/aui.audio/CMakeLists.txt
3737
@@ -5,26 +5,36 @@ add_subdirectory(3rdparty/ogg)
@@ -84,7 +84,7 @@ index 21e44153..ddc655a1 100644
8484

8585
if (AUI_PLATFORM_IOS OR AUI_PLATFORM_MACOS)
8686
auib_use_system_libs_begin()
87-
@@ -42,9 +52,14 @@ if (AUI_PLATFORM_MACOS)
87+
@@ -42,9 +52,15 @@ if (AUI_PLATFORM_MACOS)
8888
"-framework QuartzCore")
8989
endif()
9090

@@ -93,8 +93,9 @@ index 21e44153..ddc655a1 100644
9393
- VERSION adacc686124ac3568432f3dca388878963a005ee
9494
- )
9595
+if (AUIB_DISABLE)
96-
+ find_package(soxr CONFIG)
97-
+ aui_link(aui.audio PRIVATE soxr::soxr)
96+
+ include(FindPkgConfig)
97+
+ pkg_check_modules(soxr REQUIRED soxr)
98+
+ aui_link(aui.audio PRIVATE PkgConfig::soxr)
9899
+else ()
99100
+ auib_import(soxr https://github.com/aui-framework/soxr
100101
+ ADD_SUBDIRECTORY

packages/a/aui/xmake.lua

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,14 @@ package("aui")
77
"https://github.com/aui-framework/aui.git")
88

99
add_versions("v7.1.2", "a4cf965c50d75e20a319c9c8b231ad9c13c25a06ad303e1eb65d1ff141b1f85c")
10-
add_patches("v7.1.2", "patches/v7.1.2/debundle.diff", "78426f3afa61c09e56d0dd526b7dd26eb81b497d79eb172763472da111e213e7")
10+
add_patches("v7.1.2", "patches/v7.1.2/debundle.diff", "8119e7ba16ba352b2ac2fa53f2479f71b27de6a91996102151cd3f801430003d")
1111

1212
add_deps("cmake")
13+
if is_subhost("windows") then
14+
add_deps("pkgconf")
15+
else
16+
add_deps("pkg-config")
17+
end
1318
add_deps("zlib")
1419
-- aui.audio
1520
add_deps("libopus", "soxr")
@@ -49,7 +54,6 @@ package("aui")
4954
if is_plat("windows", "mingw", "linux", "macosx") then
5055
add_deps("glew")
5156
if is_plat("linux") then
52-
add_deps("pkgconf")
5357
add_deps("libx11", "dbus", "gtk3", "fontconfig")
5458
end
5559
end

0 commit comments

Comments
 (0)