Updated Makefile
Changed meson and cmake paths. Put git clone of tomlplusplus in new target.
This commit is contained in:
parent
6033ec3c00
commit
1fe9c77818
7
Makefile
7
Makefile
|
|
@ -1,6 +1,6 @@
|
||||||
# Variables for build tools
|
# Variables for build tools
|
||||||
CMAKE=/bin/cmake
|
CMAKE=/usr/bin/cmake
|
||||||
MESON=/bin/meson
|
MESON=/usr/bin/meson
|
||||||
# Paths for installed apps
|
# Paths for installed apps
|
||||||
BIN_SYSTEM_PATH=/usr/local/bin
|
BIN_SYSTEM_PATH=/usr/local/bin
|
||||||
INC_SYSTEM_PATH=/usr/include
|
INC_SYSTEM_PATH=/usr/include
|
||||||
|
|
@ -81,10 +81,11 @@ $(__Wl_clipboard):
|
||||||
ninja -C wl-clipboard/build
|
ninja -C wl-clipboard/build
|
||||||
|
|
||||||
# Build and install tomlplusplus if it's not on the system
|
# Build and install tomlplusplus if it's not on the system
|
||||||
|
tomlplusplus:
|
||||||
|
git clone https://github.com/marzer/tomlplusplus.git
|
||||||
__Tomlplusplus = $(INC_SYSTEM_PATH)/toml++
|
__Tomlplusplus = $(INC_SYSTEM_PATH)/toml++
|
||||||
$(__Tomlplusplus):
|
$(__Tomlplusplus):
|
||||||
@echo "Building and installing tomlplusplus..."
|
@echo "Building and installing tomlplusplus..."
|
||||||
git clone https://github.com/marzer/tomlplusplus.git
|
|
||||||
$(MESON) setup -C tomlplusplus build --buildtype=release
|
$(MESON) setup -C tomlplusplus build --buildtype=release
|
||||||
ninja -C tomlplusplus/build
|
ninja -C tomlplusplus/build
|
||||||
sudo $(MESON) install tomlplusplus/build
|
sudo $(MESON) install tomlplusplus/build
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user