diff --git a/examples/mqtt-dashboard/device/Makefile b/examples/mqtt-dashboard/device/Makefile index 6bad4d93..ba864f72 100644 --- a/examples/mqtt-dashboard/device/Makefile +++ b/examples/mqtt-dashboard/device/Makefile @@ -1,32 +1,24 @@ -PROG ?= example # Program we are building -DELETE = rm -rf # Command to remove files +PROG ?= ./example # Program we are building +DELETE ?= rm -rf # Command to remove files OUT ?= -o $(PROG) # Compiler argument for output file SOURCES = main.c net.c mongoose.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/documentation/#build-options 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 - PROG ?= example.exe # Use .exe suffix for the binary +ifeq ($(OS),Windows_NT) # Windows settings for MinGW compiler. To use VC: make CC=cl CFLAGS=/MD OUT=/Feexample.exe + PROG = example.exe # Use .exe suffix for the binary CC = gcc # Use MinGW gcc compiler - CFLAGS += -lws2_32 # Link against Winsock library + CFLAGS += -lws2_32 # Link against the Winsock library DELETE = cmd /C del /Q /F /S # Command prompt command to delete files - OUT ?= -o $(PROG) # Build output - MAKE += WINDOWS=1 CC=$(CC) endif -all: $(PROG) # Default target. Build and run program - $(RUN) ./$(PROG) $(ARGS) +all: $(PROG) + $(RUN) $(PROG) $(ARGS) -$(PROG): $(SOURCES) # Build program from sources +$(PROG): $(SOURCES) $(CC) $(SOURCES) $(CFLAGS) $(CFLAGS_MONGOOSE) $(CFLAGS_EXTRA) $(OUT) -clean: # Cleanup. Delete built program and all build artifacts - $(DELETE) $(PROG) *.o *.obj *.exe *.dSYM mbedtls - -# see https://mongoose.ws/tutorials/tls/#how-to-build for TLS build options - -mbedtls: # Pull and build mbedTLS library - git clone --depth 1 -b v2.28.2 https://github.com/mbed-tls/mbedtls $@ - $(MAKE) -C mbedtls/library +clean: + $(DELETE) $(PROG) *.o *.obj *.exe *.dSYM diff --git a/examples/mqtt-dashboard/device/net.c b/examples/mqtt-dashboard/device/net.c index d643cbb7..f86bbcd9 100644 --- a/examples/mqtt-dashboard/device/net.c +++ b/examples/mqtt-dashboard/device/net.c @@ -24,7 +24,7 @@ static void set_device_id(void) { char buf[15] = ""; #ifdef _WIN32 - unsigned serial = 0; + unsigned long serial = 0; if (GetVolumeInformationA("c:\\", NULL, 0, &serial, NULL, NULL, NULL, 0)) { mg_snprintf(buf, sizeof(buf), "%lx", serial); }