On Saturday 14 December 2024 23:39:52 Pali Rohár wrote: > Now all I386 symbols in lib-common/ws2_32.def.in file are defined with > stdcall @<num> suffixes. These suffixes are automatically removed for > non-I386 builds by Makefile.am rule during processing of > lib-common/*.def.in files. > > During merging of lib32/ws2_32.def and lib-common/ws2_32.def.in files, > all symbols were sorted in the final file. > --- > mingw-w64-crt/lib-common/ws2_32.def.in | 362 ++++++++++++------------- > mingw-w64-crt/lib32/ws2_32.def | 188 ------------- > 2 files changed, 181 insertions(+), 369 deletions(-) > delete mode 100644 mingw-w64-crt/lib32/ws2_32.def >
For testing it is needed to also adjust I386 ws2_32 build definitions in Makefile.am, in the same way how they are already adjusted for X64. diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am index 7b9d57c3e9bf..2bb8bd732855 100644 --- a/mingw-w64-crt/Makefile.am +++ b/mingw-w64-crt/Makefile.am @@ -1408,9 +1408,10 @@ lib32_libgdiplus_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes) lib32_libgdiplus_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS) lib32_LIBRARIES += lib32/libws2_32.a -lib32_libws2_32_a_SOURCES = $(src_libws2_32) +lib32_libws2_32_a_SOURCES = $(src_libws2_32) lib-common/ws2_32.def.in lib32_libws2_32_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes) -lib32_libws2_32_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS) +lib32_libws2_32_a_AR = $(DTDEF32) lib32/ws2_32.def && $(AR) $(ARFLAGS) +EXTRA_lib32_libws2_32_a_DEPENDENCIES=lib32/ws2_32.def lib32_LIBRARIES += lib32/libtaskschd.a lib32_libtaskschd_a_SOURCES = $(src_libtaskschd) _______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public