Merge branch 'v0.22.x'

2021-03-05 16:05:56 +01:00
parent ef1acb4e2f 637cf8a039
commit 422cf5f182
13 changed files with 142 additions and 74 deletions
--- a/meson.build
+++ b/meson.build
@@ -311,7 +311,6 @@ sources = [
 if is_windows
  sources += [
    'src/win32/Win32Main.cxx',
-    'src/win32/ComWorker.cxx',
  ]
 endif

@@ -349,6 +348,7 @@ subdir('src/system')
 subdir('src/thread')
 subdir('src/net')
 subdir('src/event')
+subdir('src/win32')

 subdir('src/apple')