Browse Source

Ensure LDLIBS is consistantly treated

pull/1114/head
Hamish Coleman 2 years ago
parent
commit
6ecc201017
  1. 3
      Makefile
  2. 4
      tools/Makefile

3
Makefile

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

4
tools/Makefile

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

Loading…
Cancel
Save