aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjaseg <git@jaseg.de>2021-06-05 22:39:02 +0200
committerjaseg <git@jaseg.de>2021-06-05 22:39:02 +0200
commitb2873329d4f79df6670bb1d7784254a27d5669d1 (patch)
tree1653658507014595a8ab7645472420e2986b1211
parent831993cdc340cde246a2ee1aad8b5f0428ec9956 (diff)
downloadgerbolyze-b2873329d4f79df6670bb1d7784254a27d5669d1.tar.gz
gerbolyze-b2873329d4f79df6670bb1d7784254a27d5669d1.tar.bz2
gerbolyze-b2873329d4f79df6670bb1d7784254a27d5669d1.zip
Hopefully fix debian CI build
-rw-r--r--svg-flatten/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/svg-flatten/Makefile b/svg-flatten/Makefile
index f47a357..4a45c7f 100644
--- a/svg-flatten/Makefile
+++ b/svg-flatten/Makefile
@@ -3,6 +3,7 @@ CXX ?= clang++
LD ?= ld
INSTALL := install
PKG_CONFIG ?= pkg-config
+PYTHON3 ?= python3
BUILDDIR ?= build
PREFIX ?= /usr/local
@@ -44,7 +45,7 @@ STB_INCLUDES ?= -isystem$(UPSTREAM_DIR)/stb
INCLUDES := -Iinclude -Isrc $(CLIPPER_INCLUDES) $(VORONOI_INCLUDES) $(POISSON_INCLUDES) $(BASE64_INCLUDES) $(ARGAGG_INCLUDES) $(CAVC_INCLUDES) $(SUBPROCESS_INCLUDES) $(MINUNIT_INCLUDES) $(STB_INCLUDES)
CXXFLAGS := -std=c++2a -g -Wall -Wextra -O2
-LDFLAGS := -lm -lstdc++ -lstdc++fs
+LDFLAGS := -lm -lstdc++ -lstdc++fs # for debian's ancient compilers
PKG_CONFIG_DEPS :=
ifdef USE_SYSTEM_PUGIXML
@@ -65,16 +66,17 @@ $(BUILDDIR)/%.o: %.cpp
$(BUILDDIR)/$(TARGET): $(SOURCES:%.cpp=$(BUILDDIR)/%.o)
@mkdir -p $(dir $@)
- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
+ $(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
$(BUILDDIR)/nopencv-test: src/test/nopencv_test.cpp src/nopencv.cpp
@mkdir -p $(dir $@)
- $(CXX) $(CXXFLAGS) $(INCLUDES) $(LDFLAGS) -o $@ $^
+ $(CXX) $(CXXFLAGS) $(INCLUDES) -o $@ $^ $(LDFLAGS)
.PHONY: tests
tests: $(BUILDDIR)/nopencv-test
$(BUILDDIR)/nopencv-test
+ $(PYTHON3) src/test/svg_tests.py
.PHONY: install
install: