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:
Maarten Bent
2018-01-20 15:15:57 +01:00
parent fb8403a064
commit dc0d93cccc
2 changed files with 14 additions and 16 deletions

View File

@@ -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)