Merge pull request #1017 from BillyONeal/remove-sortpp-pass

kelson42 · web-flow · commit 514d4461c745 · 2025-11-25T08:07:08.000+01:00
Remove SORTPP_PASS which breaks modern Windows SDKs.
diff --git a/meson.build b/meson.build
@@ -61,7 +61,6 @@ public_conf.set('LIBZIM_WITH_XAPIAN', xapian_dep.found())
 
 if build_machine.system() == 'windows'
     win_deps = declare_dependency(
-        compile_args: ['-DSORTPP_PASS'],
         link_args: ['-lRpcrt4', '-lWs2_32', '-lwinmm', '-lshlwapi']
     )
 else

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@ public_conf.set('LIBZIM_WITH_XAPIAN', xapian_dep.found())`
`61`	`61`
`62`	`62`	`if build_machine.system() == 'windows'`
`63`	`63`	`win_deps = declare_dependency(`
`64`		`- compile_args: ['-DSORTPP_PASS'],`
`65`	`64`	`link_args: ['-lRpcrt4', '-lWs2_32', '-lwinmm', '-lshlwapi']`
`66`	`65`	`)`
`67`	`66`	`else`