enoch/n2n
1
0
Fork 0
mirror of https://github.com/ntop/n2n.git synced 2024-09-16 15:31:10 +02:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Move the special windows lib config into the configure script

Browse Source
This commit is contained in:
Hamish Coleman 2023-07-02 16:58:42 +01:00
parent b22c57a16f
commit 59ecadcab2
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -154,7 +154,6 @@ LDLIBS+=$(LDLIBS_EXTRA)
ifeq ($(CONFIG_TARGET),mingw)
LDLIBS+=$(abspath win32/n2n_win32.a)
LDLIBS+=-lnetapi32 -lws2_32 -liphlpapi
N2N_DEPS+=win32/n2n_win32.a
SUBDIRS+=win32
endif

3
configure.ac
View File

@ -18,6 +18,9 @@ case "$host_os" in
# and comment "For OpenSolaris (Solaris too?)"
LIBS="-lsocket -lnsl $LIBS"
;;
mingw*)
LIBS="-lnetapi32 -lws2_32 -liphlpapi $LIBS"
;;
esac
# This replicates the old config logic from the Makefile.

5
scripts/hack_fakeautoconf.sh
View File

@ -18,12 +18,15 @@ chmod a+x configure
cat >config.mak <<EOF
CONFIG_HOST=x86_64-w64-mingw32
CONFIG_HOST_OS=mingw32
CONFIG_PREFIX=/usr/local
CC=gcc
AR=ar
WINDRES=windres
CFLAGS=$CFLAGS -g -O2
LDFLAGS=$LDFLAGS
LDLIBS_EXTRA=$LDLIBS
LDLIBS_EXTRA=-lnetapi32 -lws2_32 -liphlpapi
EOF
cat <<EOF >include/config.h