aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjaseg <git@jaseg.de>2021-04-05 13:54:14 +0200
committerjaseg <code@jaseg.net>2021-04-05 13:57:40 +0200
commit5d1bcd7fc0bff49c42783bff4d549e23a79cf34f (patch)
treeffa50fc05adeebd1a2fdba927eebf0846c195d1d
parent3288fb8345c07b4ca0deff82805d330f7d80bee7 (diff)
downloadgerbolyze-5d1bcd7fc0bff49c42783bff4d549e23a79cf34f.tar.gz
gerbolyze-5d1bcd7fc0bff49c42783bff4d549e23a79cf34f.tar.bz2
gerbolyze-5d1bcd7fc0bff49c42783bff4d549e23a79cf34f.zip
Add MacOS supportv2.0.7
-rw-r--r--README.rst18
-rw-r--r--svg-flatten/Makefile6
-rw-r--r--svg-flatten/include/gerbolyze.hpp1
3 files changed, 24 insertions, 1 deletions
diff --git a/README.rst b/README.rst
index d3824ad..66c01b7 100644
--- a/README.rst
+++ b/README.rst
@@ -124,6 +124,24 @@ Arch
pip3 install --user git+https://git.jaseg.de/pcb-tools-extension.git
pip3 install --user gerbolyze --no-binary gerbolyze
+macOS (via Homebrew)
+~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: shell
+ # Tested on a fresh Mac OS 10.15.7 Catalina installation
+
+ # Requires homebrew. To install, run:
+ # /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"\n
+ # --> Now, restart the terminal app to load new $PATH from /etc/paths <--
+
+ brew install python3 rustup pugixml cairo pango opencv pkg-config
+
+ rustup-init
+ cargo install usvg
+
+ pip3 install git+https://git.jaseg.de/pcb-tools-extension.git
+ pip3 install gerbolyze --no-binary gerbolyze
+
Build from source (any distro)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/svg-flatten/Makefile b/svg-flatten/Makefile
index 25c8048..5f22a59 100644
--- a/svg-flatten/Makefile
+++ b/svg-flatten/Makefile
@@ -66,7 +66,11 @@ $(BUILDDIR)/%.o: %.cpp
$(BUILDDIR)/$(TARGET): $(SOURCES:%.cpp=$(BUILDDIR)/%.o)
@mkdir -p $(dir $@)
- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ -Wl,--start-group $^ -lstdc++fs -Wl,--end-group
+ if [ $$(uname -s) = "Darwin" ]; then \
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^; \
+ else \
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ -Wl,--start-group $^ -lstdc++fs -Wl,--end-group; \
+ fi
.PHONY: install
install:
diff --git a/svg-flatten/include/gerbolyze.hpp b/svg-flatten/include/gerbolyze.hpp
index aea8748..ed93bbc 100644
--- a/svg-flatten/include/gerbolyze.hpp
+++ b/svg-flatten/include/gerbolyze.hpp
@@ -21,6 +21,7 @@
#include <map>
#include <iostream>
#include <string>
+#include <array>
#include <pugixml.hpp>
#include "svg_pattern.h"