From 7e9a4640bfe1b7a69a41d96dcc4dbf3f82c6633b Mon Sep 17 00:00:00 2001 From: Felix Palmen Date: Thu, 11 Jul 2024 10:41:57 +0200 Subject: [PATCH] xmoji.mk: Use bundled poser headers first --- GNUmakefile | 2 +- src/bin/xmoji/xmoji.mk | 1 + zimk | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 46047b5..92a6b29 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -26,8 +26,8 @@ include zimk/zimk.mk ifeq ($(BUNDLED_POSER),1) WITH_TLS:= 0 -INCLUDES+= -I./poser/include posercore_BUILDWITH:= # +posercore_PRECFLAGS:= -I./poser/include $(call zinc,poser/src/lib/core/core.mk) endif diff --git a/src/bin/xmoji/xmoji.mk b/src/bin/xmoji/xmoji.mk index eee3877..18027a8 100644 --- a/src/bin/xmoji/xmoji.mk +++ b/src/bin/xmoji/xmoji.mk @@ -67,6 +67,7 @@ endif ifeq ($(BUNDLED_POSER),1) xmoji_STATICDEPS+= posercore +xmoji_PRECFLAGS+= -I./poser/include xmoji_LIBS+= posercore xmoji_LDFLAGS+= -pthread else diff --git a/zimk b/zimk index 609906a..4eeb3fe 160000 --- a/zimk +++ b/zimk @@ -1 +1 @@ -Subproject commit 609906a1a911bda167517b9dbb7e4c091600d503 +Subproject commit 4eeb3fe5e9c20bdecbcbeeb70209e0cfcb563e4c