aboutsummaryrefslogtreecommitdiff
path: root/svg-flatten
diff options
context:
space:
mode:
authorjaseg <git@jaseg.de>2023-04-16 14:19:12 +0200
committerjaseg <git@jaseg.de>2023-04-16 14:19:12 +0200
commit348409a29e9f589e0d66c1d6cd7ed7f6fd05c4fc (patch)
treeba1bcee104f205503d66cda1a12cf5b7fae66837 /svg-flatten
parent0ae1da08cc34f7921555d3340d8b750d792cff39 (diff)
downloadgerbolyze-348409a29e9f589e0d66c1d6cd7ed7f6fd05c4fc.tar.gz
gerbolyze-348409a29e9f589e0d66c1d6cd7ed7f6fd05c4fc.tar.bz2
gerbolyze-348409a29e9f589e0d66c1d6cd7ed7f6fd05c4fc.zip
svg-flatten: Bump WASI SDK to v20 and fix build
Diffstat (limited to 'svg-flatten')
-rw-r--r--svg-flatten/Makefile4
-rw-r--r--svg-flatten/src/main.cpp2
-rw-r--r--svg-flatten/src/svg_doc.cpp1
-rw-r--r--svg-flatten/src/util.cpp2
4 files changed, 6 insertions, 3 deletions
diff --git a/svg-flatten/Makefile b/svg-flatten/Makefile
index 7dab263..7e9fad5 100644
--- a/svg-flatten/Makefile
+++ b/svg-flatten/Makefile
@@ -10,8 +10,8 @@ CACHEDIR ?= cache
PREFIX ?= /usr/local
UPSTREAM_DIR ?= upstream
-WASI_SDK ?= wasi-sdk-11.0
-WASI_SDK_URL ?= https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-11/wasi-sdk-11.0-linux.tar.gz
+WASI_SDK ?= wasi-sdk-20.0
+WASI_SDK_URL ?= https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/wasi-sdk-20.0-linux.tar.gz
WASI_SDK_PATH ?= $(CACHEDIR)/$(WASI_SDK)
WASI_CXX ?= $(WASI_SDK_PATH)/bin/clang++ --sysroot=$(WASI_SDK_PATH)/share/wasi-sysroot
diff --git a/svg-flatten/src/main.cpp b/svg-flatten/src/main.cpp
index b684ce4..179e0ab 100644
--- a/svg-flatten/src/main.cpp
+++ b/svg-flatten/src/main.cpp
@@ -1,7 +1,9 @@
#include <cstdlib>
#include <cstdio>
+#ifndef WASI
#include <filesystem>
+#endif
#include <iostream>
#include <iomanip>
#include <fstream>
diff --git a/svg-flatten/src/svg_doc.cpp b/svg-flatten/src/svg_doc.cpp
index d61027b..163402e 100644
--- a/svg-flatten/src/svg_doc.cpp
+++ b/svg-flatten/src/svg_doc.cpp
@@ -19,6 +19,7 @@
#include <iostream>
#include <fstream>
#include <cmath>
+#include <numbers>
#include <gerbolyze.hpp>
#include "svg_import_defs.h"
diff --git a/svg-flatten/src/util.cpp b/svg-flatten/src/util.cpp
index 1af5fb6..c242e1b 100644
--- a/svg-flatten/src/util.cpp
+++ b/svg-flatten/src/util.cpp
@@ -7,8 +7,8 @@
#ifndef NOFORK
#include <pwd.h>
#include <subprocess.h>
-#endif
#include <filesystem>
+#endif
#include "util.h"