mirror of
https://github.com/ntop/n2n.git
synced 2024-09-19 00:21:11 +02:00
Refactor to use the host triplet instead of CONFIG_TARGET
This commit is contained in:
parent
59ecadcab2
commit
1e8a085f1e
16
Makefile
16
Makefile
|
@ -38,18 +38,6 @@ ifndef UNAME_S
|
||||||
$(error Could not run uname command, cannot continue)
|
$(error Could not run uname command, cannot continue)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Any compile environment that needs different flags, libraries, includes or
|
|
||||||
# other settings will get its own CONFIG_TARGET value. For cross compiling,
|
|
||||||
# this might be set externally to the Makefile, but if not set we try to
|
|
||||||
# set a reasonable default.
|
|
||||||
|
|
||||||
export CONFIG_TARGET
|
|
||||||
ifndef CONFIG_TARGET
|
|
||||||
ifeq ($(shell uname -o),Msys)
|
|
||||||
CONFIG_TARGET=mingw
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
export MKDIR
|
export MKDIR
|
||||||
export INSTALL
|
export INSTALL
|
||||||
export INSTALL_PROG
|
export INSTALL_PROG
|
||||||
|
@ -152,7 +140,7 @@ LINT_CCODE=\
|
||||||
LDLIBS+=-ln2n
|
LDLIBS+=-ln2n
|
||||||
LDLIBS+=$(LDLIBS_EXTRA)
|
LDLIBS+=$(LDLIBS_EXTRA)
|
||||||
|
|
||||||
ifeq ($(CONFIG_TARGET),mingw)
|
ifneq (,$(findstring mingw,$(CONFIG_HOST_OS)))
|
||||||
LDLIBS+=$(abspath win32/n2n_win32.a)
|
LDLIBS+=$(abspath win32/n2n_win32.a)
|
||||||
N2N_DEPS+=win32/n2n_win32.a
|
N2N_DEPS+=win32/n2n_win32.a
|
||||||
SUBDIRS+=win32
|
SUBDIRS+=win32
|
||||||
|
@ -216,7 +204,7 @@ src/example_edge_embed_quick_edge_init: $(N2N_LIB)
|
||||||
src/example_sn_embed: $(N2N_LIB)
|
src/example_sn_embed: $(N2N_LIB)
|
||||||
src/example_edge_embed: $(N2N_LIB)
|
src/example_edge_embed: $(N2N_LIB)
|
||||||
|
|
||||||
ifeq ($(CONFIG_TARGET), mingw)
|
ifneq (,$(findstring mingw,$(CONFIG_HOST_OS)))
|
||||||
src/edge: win32/edge_rc.o
|
src/edge: win32/edge_rc.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@ DEBUG?=-g3
|
||||||
HEADERS=$(wildcard include/*.h)
|
HEADERS=$(wildcard include/*.h)
|
||||||
CFLAGS+=-I../include
|
CFLAGS+=-I../include
|
||||||
|
|
||||||
ifeq ($(CONFIG_TARGET),mingw)
|
ifneq (,$(findstring mingw,$(CONFIG_HOST_OS)))
|
||||||
CFLAGS+=-I../win32
|
CFLAGS+=-I../win32
|
||||||
endif
|
endif
|
||||||
CFLAGS+=$(DEBUG)
|
CFLAGS+=$(DEBUG)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user