mirror of
https://github.com/cesanta/mongoose.git
synced 2026-11-12 16:50:21 +00:00
unbreak tests, MG_TLS _must_ be defined in CFLAGS_EXTRA to allow being overwritten, as documented
This commit is contained in:
1 parent
cff27a72c5
commit
1228e8f620
4 files changed
+7
-4
No files matched your search
@@ -3,8 +3,9 @@
|
|||||||
PROG ?= example
|
PROG ?= example
|
||||||
TOP ?= ../../..
|
TOP ?= ../../..
|
||||||
SOURCES = main.c dashboard.c file_data.c $(TOP)/mongoose.c
|
SOURCES = main.c dashboard.c file_data.c $(TOP)/mongoose.c
|
||||||
|
CFLAGS_EXTRA ?= -DMG_TLS=MG_TLS_BUILTIN
|
||||||
CFLAGS ?= -W -Wall -Wextra -Werror -Wundef -Wshadow -O0 $(CFLAGS_EXTRA)
|
CFLAGS ?= -W -Wall -Wextra -Werror -Wundef -Wshadow -O0 $(CFLAGS_EXTRA)
|
||||||
PFLAGS = -I$(TOP) -DMG_DATA_SIZE=64 -DMG_TLS=MG_TLS_BUILTIN -DMG_ENABLE_LINES=1
|
PFLAGS = -I$(TOP) -DMG_DATA_SIZE=64 -DMG_ENABLE_LINES=1
|
||||||
AFLAGS ?= -fsanitize=signed-integer-overflow,address,undefined,alignment
|
AFLAGS ?= -fsanitize=signed-integer-overflow,address,undefined,alignment
|
||||||
|
|
||||||
all: $(PROG)
|
all: $(PROG)
|
||||||
|
|||||||
@@ -3,8 +3,9 @@
|
|||||||
PROG ?= example
|
PROG ?= example
|
||||||
TOP ?= ../../..
|
TOP ?= ../../..
|
||||||
SOURCES = main.c dashboard.c file_data.c $(TOP)/mongoose.c
|
SOURCES = main.c dashboard.c file_data.c $(TOP)/mongoose.c
|
||||||
|
CFLAGS_EXTRA ?= -DMG_TLS=MG_TLS_BUILTIN
|
||||||
CFLAGS ?= -W -Wall -Wextra -Werror -Wundef -Wshadow -O0 $(CFLAGS_EXTRA)
|
CFLAGS ?= -W -Wall -Wextra -Werror -Wundef -Wshadow -O0 $(CFLAGS_EXTRA)
|
||||||
PFLAGS = -I$(TOP) -DMG_DATA_SIZE=64 -DMG_TLS=MG_TLS_BUILTIN -DMG_ENABLE_LINES=1
|
PFLAGS = -I$(TOP) -DMG_DATA_SIZE=64 -DMG_ENABLE_LINES=1
|
||||||
AFLAGS ?= -fsanitize=signed-integer-overflow,address,undefined,alignment
|
AFLAGS ?= -fsanitize=signed-integer-overflow,address,undefined,alignment
|
||||||
|
|
||||||
all: $(PROG)
|
all: $(PROG)
|
||||||
|
|||||||
@@ -5,7 +5,8 @@ SOURCES = main.c mongoose.c mongoose_mqtt.c packed_fs.c # Source code files
|
|||||||
CFLAGS = -W -Wall -Wextra -g -I. # Build options
|
CFLAGS = -W -Wall -Wextra -g -I. # Build options
|
||||||
|
|
||||||
# Mongoose build options. See https://mongoose.ws/docs/getting-started/build-options/
|
# Mongoose build options. See https://mongoose.ws/docs/getting-started/build-options/
|
||||||
CFLAGS_MONGOOSE += -DMG_ENABLE_LINES=1 -DMG_TLS=MG_TLS_BUILTIN
|
CFLAGS_EXTRA ?= -DMG_TLS=MG_TLS_BUILTIN
|
||||||
|
CFLAGS_MONGOOSE += -DMG_ENABLE_LINES=1
|
||||||
|
|
||||||
ifeq ($(OS),Windows_NT) # Windows settings. Assume MinGW compiler. To use VC: make CC=cl CFLAGS=/MD OUT=/Feprog.exe
|
ifeq ($(OS),Windows_NT) # Windows settings. Assume MinGW compiler. To use VC: make CC=cl CFLAGS=/MD OUT=/Feprog.exe
|
||||||
PROG ?= example.exe # Use .exe suffix for the binary
|
PROG ?= example.exe # Use .exe suffix for the binary
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ SOURCES = main.c mongoose.c # Source code files, packed_fs.c contains ca.p
|
|||||||
CFLAGS = -W -Wall -Wextra -g -I. # Build options
|
CFLAGS = -W -Wall -Wextra -g -I. # Build options
|
||||||
|
|
||||||
# Mongoose build options. See https://mongoose.ws/documentation/#build-options
|
# Mongoose build options. See https://mongoose.ws/documentation/#build-options
|
||||||
|
CFLAGS_EXTRA ?= -DMG_TLS=MG_TLS_BUILTIN
|
||||||
CFLAGS_MONGOOSE += -DMG_ENABLE_LINES=1
|
CFLAGS_MONGOOSE += -DMG_ENABLE_LINES=1
|
||||||
CFLAGS_MONGOOSE += -DMG_TLS=MG_TLS_BUILTIN
|
|
||||||
#CFLAGS_MONGOOSE += -DMG_TLS=MG_TLS_OPENSSL -L/opt/homebrew/opt/openssl/lib -I/opt/homebrew/opt/openssl/include -lssl -lcrypto
|
#CFLAGS_MONGOOSE += -DMG_TLS=MG_TLS_OPENSSL -L/opt/homebrew/opt/openssl/lib -I/opt/homebrew/opt/openssl/include -lssl -lcrypto
|
||||||
#CFLAGS_MONGOOSE += -DMG_TLS=MG_TLS_MBED -L/opt/homebrew/opt/mbedtls/lib -I/opt/homebrew/opt/mbedtls/include -lmbedtls -lmbedcrypto -lmbedx509
|
#CFLAGS_MONGOOSE += -DMG_TLS=MG_TLS_MBED -L/opt/homebrew/opt/mbedtls/lib -I/opt/homebrew/opt/mbedtls/include -lmbedtls -lmbedcrypto -lmbedx509
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user