Unverified Commit 9a26e0a9 authored by M.K's avatar M.K Committed by GitHub
Browse files

Makefiles: Validate LUA selection or refer to the other Makefile. (#3269)

parent 9e08be7b
...@@ -16,10 +16,15 @@ TARGET = eagle ...@@ -16,10 +16,15 @@ TARGET = eagle
FLAVOR = debug FLAVOR = debug
# Handle Lua Directory selector # Handle Lua Directory selector
ifeq ("$(LUA)","53") ifeq ("$(LUA)","")
LUA_DIR := lua
else ifeq ("$(LUA)","51")
LUA_DIR := lua
else ifeq ("$(LUA)","53")
LUA_DIR := lua53 LUA_DIR := lua53
else else
LUA_DIR := lua $(error Unsupported value "$(LUA)" for variable "LUA", \
expected "51", "53" or unset/empty)
endif endif
ifndef PDIR # { ifndef PDIR # {
......
...@@ -18,6 +18,20 @@ endif ...@@ -18,6 +18,20 @@ endif
STD_CFLAGS=-std=gnu11 -Wimplicit -Wall STD_CFLAGS=-std=gnu11 -Wimplicit -Wall
# Validate LUA setting
ifeq ("$(LUA)","")
else ifeq ("$(LUA)","51")
# ok
else ifeq ("$(LUA)","53")
$(error Your variable LUA="$(LUA)" looks like you probably want \
app/lua53/Makefile instead)
else
$(error Unsupported value "$(LUA)" for variable "LUA", \
expected empty/unset (recommended) or "51")
endif
############################################################# #############################################################
# Configuration i.e. compile options etc. # Configuration i.e. compile options etc.
# Target specific stuff (defines etc.) goes in here! # Target specific stuff (defines etc.) goes in here!
......
...@@ -15,6 +15,20 @@ CCFLAGS += -Wall ...@@ -15,6 +15,20 @@ CCFLAGS += -Wall
TARGET = host TARGET = host
# Validate LUA setting
ifeq ("$(LUA)","")
else ifeq ("$(LUA)","51")
# ok
else ifeq ("$(LUA)","53")
$(error Your variable LUA="$(LUA)" looks like you probably want \
app/lua53/host/Makefile instead)
else
$(error Unsupported value "$(LUA)" for variable "LUA", \
expected empty/unset (recommended) or "51")
endif
VERBOSE ?= VERBOSE ?=
V ?= $(VERBOSE) V ?= $(VERBOSE)
ifeq ("$(V)","1") ifeq ("$(V)","1")
......
...@@ -18,6 +18,18 @@ endif ...@@ -18,6 +18,18 @@ endif
STD_CFLAGS=-std=gnu11 -Wimplicit -Wall STD_CFLAGS=-std=gnu11 -Wimplicit -Wall
# Validate LUA setting
ifeq ("$(LUA)","53")
# ok
else ifeq ("$(LUA)","51")
$(error Your variable LUA="$(LUA)" looks like you probably want \
app/lua/Makefile instead)
else
$(error Expected environment variable "LUA" to be "53", not "$(LUA)")
endif
############################################################# #############################################################
# Configuration i.e. compile options etc. # Configuration i.e. compile options etc.
# Target specific stuff (defines etc.) goes in here! # Target specific stuff (defines etc.) goes in here!
......
...@@ -23,6 +23,18 @@ else ...@@ -23,6 +23,18 @@ else
# MAKEFLAGS += --silent -w # MAKEFLAGS += --silent -w
endif # $(V)==1 endif # $(V)==1
# Validate LUA setting
ifeq ("$(LUA)","53")
# ok
else ifeq ("$(LUA)","51")
$(error Your variable LUA="$(LUA)" looks like you probably want \
app/lua/luac_cross/Makefile instead)
else
$(error Expected environment variable "LUA" to be "53", not "$(LUA)")
endif
DEBUG ?= DEBUG ?=
ifeq ("$(DEBUG)","1") ifeq ("$(DEBUG)","1")
FLAVOR = debug FLAVOR = debug
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment