CMake: Fix library order in wxMSW build
uuid should be linked before oleacc, otherwise it causes multiple definition of `IID_IAccessible' (with MinGW64 gcc). To simplify even more, specify all required libraries in wxTOOLKIT_LIBRARIES, in the same order as in the makefiles. Add uxtheme library, it is required since wxUxThemeEngine wrapper has been removed.
This commit is contained in:
@@ -58,21 +58,7 @@ endif()
|
||||
if(wxUSE_THREADS AND CMAKE_THREAD_LIBS_INIT)
|
||||
wx_lib_link_libraries(base PRIVATE ${CMAKE_THREAD_LIBS_INIT})
|
||||
endif()
|
||||
if(WIN32)
|
||||
wx_lib_link_libraries(base PUBLIC
|
||||
kernel32
|
||||
user32
|
||||
shell32
|
||||
ole32
|
||||
oleaut32
|
||||
uuid
|
||||
rpcrt4
|
||||
advapi32
|
||||
Shlwapi
|
||||
version
|
||||
uuid
|
||||
)
|
||||
elseif(APPLE)
|
||||
if(APPLE)
|
||||
wx_lib_link_libraries(base
|
||||
PRIVATE
|
||||
"-framework Security"
|
||||
|
@@ -68,13 +68,25 @@ endif()
|
||||
|
||||
if(WXMSW)
|
||||
set(wxTOOLKIT_LIBRARIES
|
||||
kernel32
|
||||
user32
|
||||
gdi32
|
||||
comdlg32
|
||||
winspool
|
||||
winmm
|
||||
shell32
|
||||
shlwapi
|
||||
comctl32
|
||||
ole32
|
||||
oleaut32
|
||||
uuid
|
||||
rpcrt4
|
||||
Oleacc
|
||||
advapi32
|
||||
version
|
||||
wsock32
|
||||
wininet
|
||||
oleacc
|
||||
uxtheme
|
||||
)
|
||||
elseif(WXGTK)
|
||||
if(WXGTK3)
|
||||
|
Reference in New Issue
Block a user