Updated Makefile
Fixed bug with hyprutils and made the git commands their own target. Changed how tomlplusplus is installed.
This commit is contained in:
parent
4e83c6f8e1
commit
5ebadd41ca
10
Makefile
10
Makefile
|
|
@ -32,12 +32,11 @@ $(__Hypercursor): $(__Hyperlang)
|
|||
sudo $(CMAKE) --install hyprcursor/build
|
||||
|
||||
# Build hyprutils if the .hpp file is not installed
|
||||
__Hyprutils = $(INC_SYSTEM_PATH)/hyprutils.hpp
|
||||
$(__Hyprutils):
|
||||
@if [ ! -d hyprutils ]; then\
|
||||
hyprutils:
|
||||
git submodule init
|
||||
git submodule update --remote hyprutils;\
|
||||
fi
|
||||
git submodule update --remote hyprutils
|
||||
__Hyprutils = $(INC_SYSTEM_PATH)/hyprutils.hpp
|
||||
$(__Hyprutils): hyprutils
|
||||
$(CMAKE) --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release \
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=/usr -S hyprutils -B ./hyprutils/build
|
||||
$(CMAKE) --build ./hyprutils/build --config Release --target all -j`nproc \
|
||||
|
|
@ -101,6 +100,7 @@ $(__Tomlplusplus): tomlplusplus
|
|||
@echo "Building and installing tomlplusplus..."
|
||||
cd tomlplusplus && $(MESON) setup build --buildtype=release
|
||||
ninja -C tomlplusplus/build
|
||||
DESTDIR=$(INC_SYSTEM_PATH)/toml++ \
|
||||
sudo $(MESON) install -C tomlplusplus/build
|
||||
|
||||
### PHONY targets that a user would run ###
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user