Ensure LDLIBS is consistantly treated

This commit is contained in:
Hamish Coleman 2023-05-10 18:06:41 +01:00
parent 04a2146391
commit 6ecc201017
2 changed files with 2 additions and 5 deletions

View File

@ -3,6 +3,7 @@ export CC
export AR
export CFLAGS
export LDFLAGS
export LDLIBS
export TOOLS_ADDITIONAL
include config.mak
@ -159,7 +160,7 @@ endif
ifeq ($(CONFIG_TARGET),mingw)
CFLAGS+=-I. -I./win32 -DWIN32
LDLIBS+=$(abspath win32/n2n_win32.a)
LDLIBS+=-lws2_32 -liphlpapi
LDLIBS+=-lnetapi32 -lws2_32 -liphlpapi
N2N_DEPS+=win32/n2n_win32.a
SUBDIRS+=win32
endif

View File

@ -6,13 +6,9 @@ DEBUG?=-g3
HEADERS=$(wildcard include/*.h)
CFLAGS+=-I../include
LDLIBS+=-ln2n
LDLIBS+=$(LDLIBS_EXTRA)
ifeq ($(CONFIG_TARGET),mingw)
CFLAGS+=-I../win32
LDLIBS+=$(abspath ../win32/n2n_win32.a)
LDLIBS+=-lnetapi32 -lws2_32 -liphlpapi
endif
CFLAGS+=$(DEBUG)
LDFLAGS+=-L..