MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
M.K 2021-01-06 03:57:50 +01:00 committed by GitHub
parent 9e08be7b28
commit 9a26e0a94b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 60 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Makefile
View File

@ -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 # {
@ -158,7 +163,7 @@ DDEFINES += \
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := -I $(PDIR)libc -I $(PDIR)$(LUA_DIR) -I $(PDIR)platform \ INCLUDES := -I $(PDIR)libc -I $(PDIR)$(LUA_DIR) -I $(PDIR)platform \
$(INCLUDES) -I $(PDIR) -I $(PDIR)include $(INCLUDES) -I $(PDIR) -I $(PDIR)include
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

14
app/lua/Makefile
View File

@ -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!

14
app/lua/luac_cross/Makefile
View File

@ -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")

12
app/lua53/Makefile
View File

@ -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!

12
app/lua53/host/Makefile
View File

@ -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