Fix the building the win32 subdir.

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 20:40:50 -05:00
parent 9de98c2bb0
commit 1accc76ad3
4 changed files with 15 additions and 4 deletions
+7 -1
View File
@@ -2,14 +2,20 @@
# This is not a standalone makefile, it must be called from the toplevel
# 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
HEADERS=$(wildcard include/*.h)
CFLAGS+=-I../include
LDLIBS+=-ln2n
ifeq ($(CONFIG_TARGET),mingw)
CFLAGS+=-I../win32
LDLIBS+=-lnetapi32
LDLIBS+=$(abspath ../win32/n2n_win32.a)
LDLIBS+=-lnetapi32 -lws2_32 -liphlpapi
endif
CFLAGS+=$(DEBUG)
LDFLAGS+=-L..