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

Allow windres to run when cross compiling

Browse Source
This commit is contained in:
Hamish Coleman 2023-06-21 12:21:30 +01:00
parent 0dd94a1123
commit 0545a54b13
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/tests.yml vendored
View File

@ -705,6 +705,7 @@ jobs:
./autogen.sh ./autogen.sh
export CC=${{ matrix.arch }}-gcc export CC=${{ matrix.arch }}-gcc
export AR=${{ matrix.arch }}-ar export AR=${{ matrix.arch }}-ar
export WINDRES=${{ matrix.arch }}-windres
./configure --host ${{ matrix.arch }} ./configure --host ${{ matrix.arch }}
make make

2
Makefile
View File

@ -209,7 +209,7 @@ win32:
$(MAKE) -C $@ $(MAKE) -C $@
win32/edge_rc.o: win32/edge.rc win32/edge.manifest win32/edge_rc.o: win32/edge.rc win32/edge.manifest
windres win32/edge.rc -O coff -o win32/edge_rc.o $(WINDRES) win32/edge.rc -O coff -o win32/edge_rc.o
src/edge.o: $(N2N_DEPS) src/edge.o: $(N2N_DEPS)
src/supernode.o: $(N2N_DEPS) src/supernode.o: $(N2N_DEPS)

1
config.mak.in
View File

@ -1,6 +1,7 @@
N2N_VERSION=@N2N_VERSION@ N2N_VERSION=@N2N_VERSION@
CC=@CC@ CC=@CC@
AR=@AR@ AR=@AR@
WINDRES=@WINDRES@
CFLAGS=@CFLAGS@ -I./include CFLAGS=@CFLAGS@ -I./include
LDFLAGS=@LDFLAGS@ -L. LDFLAGS=@LDFLAGS@ -L.
LDLIBS_EXTRA=@N2N_LIBS_EXTRA@ LDLIBS_EXTRA=@N2N_LIBS_EXTRA@

4
configure.ac
View File

@ -12,6 +12,9 @@ fi
if test "${AR+set}" != set; then if test "${AR+set}" != set; then
AR=ar AR=ar
fi fi
if test "${WINDRES+set}" != set; then
WINDRES=windres
fi
N2N_LIBS_EXTRA= N2N_LIBS_EXTRA=
@ -149,6 +152,7 @@ AC_DEFINE_UNQUOTED(PACKAGE_OSNAME, "${OSNAME}", [OS name])
AC_SUBST(CC) AC_SUBST(CC)
AC_SUBST(AR) AC_SUBST(AR)
AC_SUBST(WINDRES)
AC_SUBST(CFLAGS) AC_SUBST(CFLAGS)
AC_SUBST(LDFLAGS) AC_SUBST(LDFLAGS)
AC_SUBST(N2N_VERSION) AC_SUBST(N2N_VERSION)