From 4d2e92ac810861396bf2f0051e871f033c3a431c Mon Sep 17 00:00:00 2001 From: Hamish Coleman Date: Sun, 2 Jul 2023 17:11:12 +0100 Subject: [PATCH] Ensure library is included in correct order It looks to me that the correct way to address this build wrinkle is simply to add the win32 functions to the libn2n when building a win32 output, then there is no additional magic library juggling required for the win32 case --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5b345e0..840a120 100644 --- a/Makefile +++ b/Makefile @@ -136,12 +136,13 @@ LINT_CCODE=\ tools/tests-transform.c \ tools/tests-wire.c \ - LDLIBS+=-ln2n +ifneq (,$(findstring mingw,$(CONFIG_HOST_OS))) +LDLIBS+=$(abspath win32/n2n_win32.a) +endif LDLIBS+=$(LDLIBS_EXTRA) ifneq (,$(findstring mingw,$(CONFIG_HOST_OS))) -LDLIBS+=$(abspath win32/n2n_win32.a) N2N_DEPS+=win32/n2n_win32.a SUBDIRS+=win32 endif