mirror of https://github.com/ntop/n2n.git
Browse Source
* Provide a minimal reimplementation of our autoconf, to try windows builds * Try building with windows * Fix thinko in spelling * Ensure shell script runs inside a shell * Add a hack to aid include discovery * Just keep adding tech debt... * Assume that we will have slashes in some of the replacement strings and avoid that char with sed * Restore one slash * Hack around the tools makefile interdependancy bug * A correct cflags include hack for each compile dir * Ensure we link against winsock (note, even though this says 32bit, it should link the 64bit library ... I think) * Bad link ordering if we dont use LDLIBS * Remove unused make variable * Remove makefile duplication using inheritance (this does mean you can no longer cd tools; make, but must do make tools) * Add missing library for win32 * Show OS variable * Make hack autoconf more robust for tests on non gitlab runners * Remove no longer used substitutions from hack autoconf * Add missing include path to tools under win32 * Build the win32 subdir when the compiler is Msys * The different subdirs have different dependancies * Ensure we can find the include files * Fix library link ordering * Ensure the tools dir can find the special win32 lib * Deal with the differing basic type sizes on both linux/64bit and windows/64bit * Document the steps to mimic the github windows/mingw build locally - to allow for simpler debugging * Ensure branch name in instructions matches my test branch name * Clarify the shell needed to build with mingw * Since the makefile depends on knowing the OS, raise a fatal error if we cannot determine this * Handling different compile environments is hard. - Linux: sane and reasonable results for both uname -s (=Linux) and uname -o (=GNU/Linux) - Windows/Mingw: insane results for uname -s (=MSYS_NT-$MAJOR.$MINOR-$BUILDNR) but sane results for uname -o (Msys) - Macos: sane results for uname -s (=Darwin) but does not support uname -o at all * Revamp the way that Mingw is detected * Avoid attempting to generate gcovr report when running under windows * Whoops, isolate the right step * Fix spelling mistake * win32/Makefile: Remove unused setting and add comment * ensure that all win32 includes use the same expected path * Allow simpler cross compilation by letting configure pass the CC and AR environment through * Avoid multiple '_CRT_SECURE_NO_WARNINGS redefined' warnings * Convert to a consolidated CONFIG_TARGET variable to select any different compile options * Use the more generic printf defines to avoid warnings on mingw * Update mingw build docs * English better for reader happy make * Address a number of mingw compiler warnings * Fix Visual C compile * Be sure to document some of the hacky nature of the mingw buildpull/845/head
Hamish Coleman
3 years ago
committed by
GitHub
18 changed files with 207 additions and 61 deletions
@ -0,0 +1,24 @@ |
|||||
|
#!/bin/sh |
||||
|
# |
||||
|
# Specifically for windows, where installing autoconf looks suspiciously |
||||
|
# like boiling the ocean. |
||||
|
|
||||
|
cat Makefile.in | sed \ |
||||
|
-e "s%@N2N_VERSION_SHORT@%FIXME%g" \ |
||||
|
-e "s%@GIT_COMMITS@%FIXME%g" \ |
||||
|
-e "s%@CC@%gcc%g" \ |
||||
|
-e "s%@AR@%ar%g" \ |
||||
|
-e "s%@CFLAGS@%$CFLAGS%g" \ |
||||
|
-e "s%@LDFLAGS@%$LDFLAGS%g" \ |
||||
|
-e "s%@N2N_LIBS@%$LDLIBS%g" \ |
||||
|
> Makefile |
||||
|
|
||||
|
cat tools/Makefile.in | sed \ |
||||
|
-e "s%@ADDITIONAL_TOOLS@%%g" \ |
||||
|
> tools/Makefile |
||||
|
|
||||
|
cat <<EOF >include/config.h |
||||
|
#define PACKAGE_VERSION "FIXME" |
||||
|
#define PACKAGE_OSNAME "FIXME" |
||||
|
#define GIT_RELEASE "FIXME" |
||||
|
EOF |
@ -0,0 +1,19 @@ |
|||||
|
#
|
||||
|
# This is not a standalone makefile, it must be called from the toplevel
|
||||
|
# makefile to inherit the correct environment
|
||||
|
|
||||
|
CFLAGS+=-I../include |
||||
|
LDFLAGS+=-L.. |
||||
|
|
||||
|
.PHONY: all clean install |
||||
|
|
||||
|
all: n2n_win32.a |
||||
|
|
||||
|
n2n_win32.a: getopt1.o getopt.o wintap.o |
||||
|
$(AR) rcs $@ $+ |
||||
|
|
||||
|
clean: |
||||
|
rm -rf n2n_win32.a *.o *.gcno *.gcda |
||||
|
|
||||
|
install: |
||||
|
true |
Loading…
Reference in new issue