From: Jérémie Astor Date: Sat, 29 Jan 2022 15:18:39 +0000 (+0100) Subject: :wrench: ease up cross compilation X-Git-Tag: nightly~385 X-Git-Url: http://10.10.0.4:5575/?a=commitdiff_plain;h=1584d5bf53a011b91e429ef43b7d3fab86a2d1d9;p=gwion.git :wrench: ease up cross compilation --- diff --git a/Makefile b/Makefile index 4d09c22d..ea86d123 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ CFLAGS += -Wno-pedantic CFLAGS += -DGWION_BUILTIN -all: util/include/generated.h options-show ${GWLIBS} src/main.o +all: options-show ${GWLIBS} src/main.o @$(info link ${PRG}) @${CC} src/main.o -o ${PRG} ${LDFLAGS} ${LIBS} @@ -77,13 +77,10 @@ lto: lib${PRG}.a: ${lib_obj} @${AR} ${AR_OPT} -util/include/generated.h: - @${MAKE} -C util include/generated.h - util/libtermcolor/libtermcolor.a: @+${MAKE} BUILD_ON_WINDOWS=${BUILD_ON_WINDOWS} -s -C util/libtermcolor static -util/libgwion_util.a: util/include/generated.h +util/libgwion_util.a: @+GWION_PACKAGE= ${MAKE} -s -C util util: util/libgwion_util.a