deon/glava
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made renderer structure private, update Makefile, closes #130

Browse Source
This commit is contained in:
Jarcode
2019-08-28 15:20:51 -07:00
parent 0a4d0cb099
commit 5de224c3e1
5 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@@ -1,4 +1,4 @@
.PHONY: all install clean ninja build
.PHONY: all install clean ninja
# In case these were specified explicitly as options instead of environment variables, export them to child processes
export DESTDIR
@@ -11,17 +11,17 @@ MESON_CONF = $(BUILD_DIR) -Ddisable_obs=true --prefix /usr
# Support assigning standalone/debug builds as the old Makefile did, otherwise complain
ifneq ($(BUILD),debug)
MESON_CONF += --buildtype=release
MESON_CONF += --buildtype=release
ifdef BUILD
@echo "WARNING: ignoring build option '$(BUILD)' in compatibility Makefile"
$(warning WARNING: ignoring build option '$(BUILD)' in compatibility Makefile)
endif
endif
ifeq ($(INSTALL),standalone)
MESON_CONF += -Dstandalone=true
MESON_CONF += -Dstandalone=true
else
ifdef INSTALL
@echo "WARNING: ignoring install option '$(INSTALL)' in compatibility Makefile"
$(warning WARNING: ignoring install option '$(INSTALL)' in compatibility Makefile)
endif
endif
@@ -31,18 +31,13 @@ STATE = $(BUILD),$(INSTALL),$(PYTHON),$(CC),$(CFLAGS),$(DESTDIR)
$(shell if [[ ! -e build_state ]]; then touch build_state; fi)
$(shell if [ '$(STATE)' != "`cat build_state`" ]; then echo '$(STATE)' > build_state; fi)
ifndef BUILD
@echo ""
@echo "PACKAGE MAINTAINER NOTICE: Configuring release build for compatibility with old makefile."
@echo " Some new features may be missing."
@echo " If you are a package maintainer consider using meson directly!"
@echo ""
endif
all: ninja
# Rebuild if the makefile state changes to maintain old behaviour and smooth rebuilds with altered parameters
build: build_state
$(warning !!PACKAGE MAINTAINER NOTICE!!)
$(warning Configuring build for compatibility with old makefile. Some new features may be missing.)
$(warning If you are a package maintainer consider using meson directly!)
@rm -rf $(BUILD_DIR)
meson $(BUILD_DIR)
meson configure $(MESON_CONF)