wt/mongoose
1
0 Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2026-10-23 11:44:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better CFLAGS for SSL when building examples

Browse Source
This commit is contained in:
cpq committed 2022-08-11 12:12:00 +01:00
1 parent ef9f7d4c16
commit ef6fbad0cb
5 files changed
+24 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Makefile
+2 -2
View File
@@ -9,8 +9,8 @@ INCS ?= -Isrc -I.
SSL ?= MBEDTLS
CWD ?= $(realpath $(CURDIR))
ENV ?= -e Tmp=. -e WINEDEBUG=-all
DOCKERCMD ?= docker run --platform=linux/amd64
DOCKER ?= $(DOCKERCMD) --rm $(ENV) -v $(CWD):$(CWD) -w $(CWD)
D ?= docker
DOCKER ?= $(D) run --rm $(ENV) -v $(CWD):$(CWD) -w $(CWD)
VCFLAGS = /nologo /W3 /O2 /MD /I. $(DEFS) $(TFLAGS)
IPV6 ?= 1
ASAN ?= -fsanitize=address,undefined -fno-sanitize-recover=all
examples/mqtt-client-aws-iot/Makefile
+11 -2
View File
@@ -1,11 +1,20 @@
PROG ?= example
CFLAGS ?= -W -Wall -O2 -DMG_ENABLE_MBEDTLS=1 -lmbedtls -lmbedcrypto -lmbedx509
CFLAGS ?= -W -Wall -Wextra -O2
SSL ?= MBEDTLS
ifeq "$(SSL)" "MBEDTLS"
CFLAGS += -DMG_ENABLE_MBEDTLS=1 -lmbedtls -lmbedcrypto -lmbedx509 -L$(MBEDTLS)/lib -I$(MBEDTLS)/include
endif
ifeq "$(SSL)" "OPENSSL"
CFLAGS += -DMG_ENABLE_OPENSSL=1 -lssl -lcrypto -L$(OPENSSL)/lib -I$(OPENSSL)/include
endif
all: $(PROG)
$(RUN) ./$(PROG) $(ARGS)
$(PROG): main.c
$(CC) main.c ../../mongoose.c -I../.. $(CFLAGS) -o $(PROG)
$(CC) main.c ../../mongoose.c -I../.. $(CFLAGS) $(EXTRA_CFLAGS) -o $(PROG)
clean:
rm -rf $(PROG) *.o *.dSYM *.gcov *.gcno *.gcda *.obj *.exe *.ilk *.pdb
examples/stm32/nucleo-f746zg-baremetal/Makefile
+3 -2
View File
@@ -1,13 +1,14 @@
TARGET = firmware
ROOT ?= $(realpath $(CURDIR)/../../..)
DOCKER ?= docker run --rm -v $(ROOT):$(ROOT) -w $(CURDIR) mdashnet/armgcc
D ?= docker
DOCKER ?= $(D) run --rm -v $(ROOT):$(ROOT) -w $(CURDIR) mdashnet/armgcc
CROSS ?= arm-none-eabi
CFLAGS ?= -W -Wall -Wextra -Werror -Wundef -Wshadow -Wdouble-promotion \
-Wformat-truncation -fno-common -Wconversion \
-g3 -Os -ffunction-sections -fdata-sections \
-I. -I$(ROOT) -DMG_ARCH=MG_ARCH_NEWLIB -DMIP_DEBUG=1 \
-DMG_ENABLE_CUSTOM_MILLIS=1 -DMG_ENABLE_LINES=1 -DMG_ENABLE_MIP=1 \
-mcpu=cortex-m7 -mthumb -mfloat-abi=softfp -mfpu=vfpv4 $(EXTRA)
-mcpu=cortex-m7 -mthumb -mfloat-abi=hard -mfpu=auto $(EXTRA_CFLAGS)
LDFLAGS ?= -Tlink.ld -nostartfiles -nostdlib --specs nano.specs -lc -lgcc -Wl,--gc-sections -Wl,-Map=$@.map
SOURCES = boot.c main.c syscalls.c $(ROOT)/mongoose.c
examples/uart-bridge/packed_fs.c
+4 -4
View File
@@ -1812,10 +1812,10 @@ static const struct packed_file {
size_t size;
time_t mtime;
} packed_files[] = {
{"/web_root/index.html", v1, sizeof(v1), 1654623573},
{"/web_root/main.js", v2, sizeof(v2), 1659000445},
{"/web_root/preact.min.js", v3, sizeof(v3), 1654623573},
{"/web_root/style.css", v4, sizeof(v4), 1655548336},
{"/web_root/index.html", v1, sizeof(v1), 1659483223},
{"/web_root/main.js", v2, sizeof(v2), 1659483223},
{"/web_root/preact.min.js", v3, sizeof(v3), 1659483223},
{"/web_root/style.css", v4, sizeof(v4), 1659483223},
{NULL, NULL, 0, 0}
};
examples/webui-plain/Makefile
+4 -3
View File
@@ -1,12 +1,13 @@
PROG ?= example
CFLAGS ?= -W -Wall -Wextra -O2
SSL = ?
ifeq "$(SSL)" "MBEDTLS"
CFLAGS += -DMG_ENABLE_MBEDTLS=1 -lmbedtls -lmbedcrypto -lmbedx509
CFLAGS += -DMG_ENABLE_MBEDTLS=1 -lmbedtls -lmbedcrypto -lmbedx509 -L$(MBEDTLS)/lib -I$(MBEDTLS)/include
endif
ifeq "$(SSL)" "OPENSSL"
CFLAGS += -DMG_ENABLE_OPENSSL=1 -lssl -lcrypto
CFLAGS += -DMG_ENABLE_OPENSSL=1 -lssl -lcrypto -L$(OPENSSL)/lib -I$(OPENSSL)/include
endif
all: $(PROG)
@@ -14,7 +15,7 @@ all: $(PROG)
$(PROG): main.c
$(CC) ../../mongoose.c -I../.. -W -Wall $(CFLAGS) $(EXTRA_CFLAGS) -o $(PROG) main.c
$(CC) ../../mongoose.c -I../.. $(CFLAGS) $(EXTRA_CFLAGS) -o $(PROG) main.c
clean:
rm -rf $(PROG) *.o *.dSYM *.gcov *.gcno *.gcda *.obj *.exe *.ilk *.pdb