OpenBSD changes needed: Changed makefile using sh, changed main.cpp includes

This commit is contained in:
Raymond Marx 2020-12-20 15:20:29 +01:00
parent 4bb73aa6bc
commit 6ce6bc2a9c
3 changed files with 17 additions and 3 deletions

View File

@ -1,7 +1,7 @@
PREFIX ?= /usr/local
MANDIR ?= $(PREFIX)/share/man/man1/
BUILDTYPE ?= Release
SHELL = /bin/bash
SHELL = /bin/sh
# inherit from env if set
CC := $(CC)

View File

@ -63,6 +63,14 @@ $ make -j
$ make install
```
On OpenBSD
```sh
$ git clone https://github.com/mapbox/tippecanoe.git
$ cd tippecanoe
$ gmake
$ doas gmake install
```
See [Development](#development) below for how to upgrade your
C++ compiler or install prerequisite packages if you get
compiler errors.

View File

@ -39,7 +39,13 @@
#include <sys/sysctl.h>
#include <sys/param.h>
#include <sys/mount.h>
#else
#endif
#ifdef __OpenBSD__
#include <sys/types.h>
#include <sys/mount.h>
#endif
#if !defined(__APPLE__) && !defined(__OpenBSD__)
#include <sys/statfs.h>
#endif
@ -85,7 +91,7 @@ struct source {
std::string layer = "";
std::string file = "";
std::string description = "";
std::string format = "";
std::string format = "";
};
size_t CPUS;