Skip to content

Commit 9d44439

Browse files
committed
try fix Windows@ARM64
1 parent 46df933 commit 9d44439

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

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

Lines changed: 2 additions & 2 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..e3154d7f 100644
34+
index 21e44153..afbc367b 100644
3535
--- a/aui.audio/CMakeLists.txt
3636
+++ b/aui.audio/CMakeLists.txt
3737
@@ -5,26 +5,36 @@ add_subdirectory(3rdparty/ogg)
@@ -75,7 +75,7 @@ index 21e44153..e3154d7f 100644
7575
-auib_import(Opus https://github.com/xiph/opus.git VERSION v1.4)
7676
-aui_link(aui.audio PRIVATE Opus::opus)
7777
+if (AUIB_DISABLE)
78-
+ find_package(opus CONFIG REQUIRED)
78+
+ find_package(Opus CONFIG REQUIRED)
7979
+ aui_link(aui.audio PRIVATE Opus::opus)
8080
+else ()
8181
+ auib_import(Opus https://github.com/xiph/opus.git VERSION v1.4)

packages/a/aui/xmake.lua

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ 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", "927c6f6ee6e0998f2e79d6d8cfc9dea8de62b301cf1baa1c84c325d5d654275b")
10+
add_patches("v7.1.2", "patches/v7.1.2/debundle.diff", "61aa96174f63aceb93cd39ae5f81be08bb28a8345f87db77f3f3ea89f218fb12")
1111

1212
add_deps("cmake")
1313
if is_subhost("windows") then
@@ -100,6 +100,9 @@ package("aui")
100100
"-DAUIB_NO_PRECOMPILED=TRUE",
101101
"-DAUIB_DISABLE=ON"
102102
}
103+
if package:is_plat("windows") and package:is_arch("arm64") then
104+
io.replace("cmake/aui.build.cmake", [[if (CMAKE_GENERATOR_PLATFORM MATCHES "(arm64)|(ARM64)" OR CMAKE_SYSTEM_PROCESSOR MATCHES "(aarch64|arm64)")]], [[if (1)]], {plain = true})
105+
end
103106
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release"))
104107
table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
105108
import("package.tools.cmake").install(package, configs)

0 commit comments

Comments
 (0)