Skip to content

Commit 46df933

Browse files
committed
be generous, gift shell32 to windows/mingw
1 parent 226bedf commit 46df933

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ index 21e44153..e3154d7f 100644
106106
+ aui_link(aui.audio PRIVATE soxr)
107107
+endif ()
108108
diff --git a/aui.core/CMakeLists.txt b/aui.core/CMakeLists.txt
109-
index 6aa1b072..6552c008 100644
109+
index 6aa1b072..5cb497f6 100644
110110
--- a/aui.core/CMakeLists.txt
111111
+++ b/aui.core/CMakeLists.txt
112112
@@ -6,7 +6,9 @@ option(AUI_ENABLE_ASAN "Enable AddressSanitizer" OFF)
@@ -135,7 +135,7 @@ index 6aa1b072..6552c008 100644
135135
set(_use_backtrace TRUE)
136136
else()
137137

138-
@@ -84,7 +90,11 @@ endif()
138+
@@ -84,13 +90,17 @@ endif()
139139

140140
if(_use_backtrace)
141141
message(STATUS "Stacktrace backend: backtrace")
@@ -148,6 +148,13 @@ index 6aa1b072..6552c008 100644
148148
target_compile_definitions(aui.core PRIVATE AUI_USE_BACKTRACE=1)
149149
elseif(_use_unwind)
150150
message(STATUS "Stacktrace backend: unwind")
151+
target_compile_definitions(aui.core PRIVATE AUI_USE_UNWIND=1)
152+
elseif(WIN32)
153+
- aui_link(aui.core PRIVATE dbghelp shlwapi.lib)
154+
+ aui_link(aui.core PRIVATE dbghelp shell32 shlwapi.lib)
155+
message(STATUS "Stacktrace backend: dbghelp")
156+
else()
157+
message(STATUS "Stacktrace backend: none")
151158
@@ -146,17 +156,23 @@ if (AUI_SHARED_PTR_FIND_INSTANCES)
152159
endif()
153160

packages/a/aui/xmake.lua

Lines changed: 2 additions & 2 deletions
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", "416f16ef7040aae0f50b750ddca1cb34a0493d4b209b911581ff0f38143ed793")
10+
add_patches("v7.1.2", "patches/v7.1.2/debundle.diff", "927c6f6ee6e0998f2e79d6d8cfc9dea8de62b301cf1baa1c84c325d5d654275b")
1111

1212
add_deps("cmake")
1313
if is_subhost("windows") then
@@ -38,7 +38,7 @@ package("aui")
3838
add_deps("libbacktrace")
3939
add_syslinks("threads", "dl")
4040
elseif is_plat("windows", "mingw") then
41-
add_syslinks("dbghelp", "shlwapi", "kernel32", "psapi")
41+
add_syslinks("dbghelp", "shell32", "shlwapi", "kernel32", "psapi")
4242
elseif is_plat("android") then
4343
add_syslinks("log")
4444
end

0 commit comments

Comments
 (0)