From 5efca7848b862c65aad0ff240ecb7436d19d1873 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Mon, 7 Jun 2021 08:40:06 +0200 Subject: [PATCH] libs/xml: Pass XML_CFLAGS --- README.md | 8 +++----- libs/xml/Makefile | 4 +++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 769f12e..8d2d863 100644 --- a/README.md +++ b/README.md @@ -27,15 +27,13 @@ There's plenty of other editors for the first-party id Tech games. ## Compiling To compile on a standard GNU/Linux system: -`LDFLAGS=-ldl gmake -j $(nproc)` - -For BSD systems you'll have to point CFLAGS to whereever your package headers are installed. -gtkgtlext-1.0 is notorious for using both include and lib/gtkgtlext-1.0/include for headers. Yes. +`LDFLAGS=-ldl make -j $(nproc)` +On BSD you should probably use GNU make right now. The Makefiles are simple enough however. Clang should also be supported, pass CC=clang and CXX=clang++ if you want to use it. On NT you'll probably have a build command-line likes this: -`CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ PKG_CONFIG_PATH=/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig make -j 4` +`CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ PKG_CONFIG_PATH=/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig make -j 4` Not all works yet, but stay tuned. ## Dependencies diff --git a/libs/xml/Makefile b/libs/xml/Makefile index 85b35f4..9275cbd 100644 --- a/libs/xml/Makefile +++ b/libs/xml/Makefile @@ -1,7 +1,9 @@ # WorldSpawn Makefile GTK_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -LIB_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) -I../../include -I../../libs -DGTK_TARGET=2 +XML_CFLAGS=$(shell pkg-config --cflags libxml-2.0) + +LIB_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) -I../../include -I../../libs -DGTK_TARGET=2 DO_CXX=$(CXX) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .cpp.o: