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

Fix the building the win32 subdir.

Browse Source 
It looks like the github windows build environment is not correctly
inheriting environment variables.  Which is strange, as that has not
been changed with the recent updates.  Include the vars directly as a
workaround (and plan to refactor later)
This commit is contained in:
Hamish Coleman 2023-04-30 19:44:38 -05:00
parent 9de98c2bb0
commit 1accc76ad3
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/n2n_typedefs.h
View File

@ -51,6 +51,7 @@ typedef int ssize_t;
typedef unsigned long in_addr_t; typedef unsigned long in_addr_t;
#include "n2n_win32.h" #include "n2n_win32.h"
// FIXME - the above include is from a different subdir
#endif /* #if defined(_MSC_VER) || defined(__MINGW32__) */ #endif /* #if defined(_MSC_VER) || defined(__MINGW32__) */

4
scripts/hack_fakeautoconf.sh
View File

@ -6,8 +6,8 @@
cat >config.mak <<EOF cat >config.mak <<EOF
CC=gcc CC=gcc
AR=ar AR=ar
CFLAGS=$CFLAGS CFLAGS=$CFLAGS -g -O2 -I./include
LDFLAGS=$LDFLAGS LDFLAGS=$LDFLAGS -L.
N2N_LIBS_EXTRA=$LDLIBS N2N_LIBS_EXTRA=$LDLIBS
EOF EOF

8
tools/Makefile
View File

@ -2,14 +2,20 @@
# This is not a standalone makefile, it must be called from the toplevel # This is not a standalone makefile, it must be called from the toplevel
# makefile to inherit the correct environment # makefile to inherit the correct environment
# The vars included here should be part of the environment.
# TODO - refactor this and debug why they need to be included for windows
include ../config.mak
DEBUG?=-g3 DEBUG?=-g3
HEADERS=$(wildcard include/*.h) HEADERS=$(wildcard include/*.h)
CFLAGS+=-I../include CFLAGS+=-I../include
LDLIBS+=-ln2n LDLIBS+=-ln2n
ifeq ($(CONFIG_TARGET),mingw) ifeq ($(CONFIG_TARGET),mingw)
CFLAGS+=-I../win32 CFLAGS+=-I../win32
LDLIBS+=-lnetapi32 LDLIBS+=$(abspath ../win32/n2n_win32.a)
LDLIBS+=-lnetapi32 -lws2_32 -liphlpapi
endif endif
CFLAGS+=$(DEBUG) CFLAGS+=$(DEBUG)
LDFLAGS+=-L.. LDFLAGS+=-L..

6
win32/Makefile
View File

@ -2,7 +2,11 @@
# This is not a standalone makefile, it must be called from the toplevel # This is not a standalone makefile, it must be called from the toplevel
# makefile to inherit the correct environment # makefile to inherit the correct environment
CFLAGS+=-I../include # The vars included here should be part of the environment.
# TODO - refactor this and debug why they need to be included for windows
include ../config.mak
CFLAGS+=-I../include -I.
LDFLAGS+=-L.. LDFLAGS+=-L..
.PHONY: all clean install .PHONY: all clean install