Skip to content

Commit 4f6fbc5

Browse files
committed
Adding warnings for debug mode
1 parent 923f487 commit 4f6fbc5

2 files changed

Lines changed: 13 additions & 9 deletions

File tree

GNUmakefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ ARCH_TARGET ?=
4040
# BUILD FLAGS
4141
CIVETWEB_BUILD_FLAGS := -o civetweb.o -I"$(MAKEFILE_DIR)/include/" -c "$(MAKEFILE_DIR)/src/civetweb/civetweb.c" -I"$(WEBUI_TLS_INCLUDE)" $(TLS_CFLAG) -w
4242
CIVETWEB_DEFINE_FLAGS = -DNDEBUG -DNO_CACHING -DNO_CGI -DUSE_WEBSOCKET $(TLS_CFLAG)
43-
WEBUI_BUILD_FLAGS := -o webui.o -I"$(MAKEFILE_DIR)/include/" -c "$(MAKEFILE_DIR)/src/webui.c" -I"$(WEBUI_TLS_INCLUDE)" $(TLS_CFLAG) -w
43+
WEBUI_BUILD_FLAGS := -o webui.o -I"$(MAKEFILE_DIR)/include/" -c "$(MAKEFILE_DIR)/src/webui.c" -I"$(WEBUI_TLS_INCLUDE)" $(TLS_CFLAG)
44+
WARNING_RELEASE := -w
45+
WARNING_LOG := -Wall -Wno-unused
4446

4547
# OUTPUT FILES
4648
# The static output is the same for all platforms
@@ -109,14 +111,14 @@ endif
109111
@cd "$(BUILD_DIR)/debug" \
110112
&& echo "Build WebUI library ($(CC) $(TARGET)debug static)..." \
111113
&& $(CC) $(TARGET) $(CIVETWEB_BUILD_FLAGS) $(CIVETWEB_DEFINE_FLAGS) -g \
112-
&& $(CC) $(TARGET) $(WEBUI_BUILD_FLAGS) -g -DWEBUI_LOG \
114+
&& $(CC) $(TARGET) $(WEBUI_BUILD_FLAGS) $(WARNING_LOG) -g -DWEBUI_LOG \
113115
&& $(LLVM_OPT)ar rc $(LIB_STATIC_OUT) webui.o civetweb.o $(WEBKIT_OBJ) \
114116
&& $(LLVM_OPT)ranlib $(LIB_STATIC_OUT)
115117
# Dynamic with Debug info
116118
@cd "$(BUILD_DIR)/debug" \
117119
&& echo "Build WebUI library ($(CC) $(TARGET)debug dynamic)..." \
118120
&& $(CC) $(TARGET) $(CIVETWEB_BUILD_FLAGS) $(CIVETWEB_DEFINE_FLAGS) -g -fPIC \
119-
&& $(CC) $(TARGET) $(WEBUI_BUILD_FLAGS) -g -fPIC -DWEBUI_LOG \
121+
&& $(CC) $(TARGET) $(WEBUI_BUILD_FLAGS) $(WARNING_LOG) -g -fPIC -DWEBUI_LOG \
120122
&& $(CC) $(TARGET) -shared -o $(LIB_DYN_OUT) webui.o civetweb.o $(WEBKIT_OBJ) -g -L"$(WEBUI_TLS_LIB)" $(TLS_LDFLAG_DYNAMIC) $(LWS2_OPT) $(WKWEBKIT_LINK_FLAGS)
121123
ifeq ($(PLATFORM),windows)
122124
@cd "$(BUILD_DIR)/debug" && del *.o >nul 2>&1
@@ -142,14 +144,14 @@ endif
142144
@cd "$(BUILD_DIR)" \
143145
&& echo "Build WebUI library ($(CC) $(TARGET)release static)..." \
144146
&& $(CC) $(TARGET) $(CIVETWEB_BUILD_FLAGS) $(CIVETWEB_DEFINE_FLAGS) -Os \
145-
&& $(CC) $(TARGET) $(WEBUI_BUILD_FLAGS) -Os \
147+
&& $(CC) $(TARGET) $(WEBUI_BUILD_FLAGS) $(WARNING_RELEASE) -Os \
146148
&& $(LLVM_OPT)ar rc $(LIB_STATIC_OUT) webui.o civetweb.o $(WEBKIT_OBJ) \
147149
&& $(LLVM_OPT)ranlib $(LIB_STATIC_OUT)
148150
# Dynamic Release
149151
@cd "$(BUILD_DIR)" \
150152
&& echo "Build WebUI library ($(CC) $(TARGET)release dynamic)..." \
151153
&& $(CC) $(TARGET) $(CIVETWEB_BUILD_FLAGS) $(CIVETWEB_DEFINE_FLAGS) -Os -fPIC \
152-
&& $(CC) $(TARGET) $(WEBUI_BUILD_FLAGS) -O3 -fPIC \
154+
&& $(CC) $(TARGET) $(WEBUI_BUILD_FLAGS) $(WARNING_RELEASE) -O3 -fPIC \
153155
&& $(CC) $(TARGET) -shared -o $(LIB_DYN_OUT) webui.o civetweb.o $(WEBKIT_OBJ) -L"$(WEBUI_TLS_LIB)" $(TLS_LDFLAG_DYNAMIC) $(LWS2_OPT) $(WKWEBKIT_LINK_FLAGS)
154156
# Clean
155157
ifeq ($(PLATFORM),windows)

Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ TLS_LDFLAG_DYNAMIC += $(TLS_LDFLAG_DYNAMIC) /LIBPATH:"."
3131
CIVETWEB_BUILD_FLAGS = /Fo"civetweb.obj" /c /EHsc "$(MAKEDIR)/src/civetweb/civetweb.c" /I"$(MAKEDIR)/src/civetweb/" $(TLS_CFLAG)
3232
CIVETWEB_DEFINE_FLAGS = /D NDEBUG /D NO_CACHING /D NO_CGI /D USE_WEBSOCKET
3333
WEBUI_BUILD_FLAGS = /Fo"webui.obj" /c /EHsc "$(MAKEDIR)/src/webui.c" /I"$(MAKEDIR)/include" /I"$(WEBUI_TLS_INCLUDE)" $(TLS_CFLAG)
34+
WARNING_RELEASE = /w
35+
WARNING_LOG = /W4
3436

3537
# Output Commands
3638
LIB_STATIC_OUT = /OUT:"$(WEBUI_OUT_LIB_NAME)-static.lib" "webui.obj" "civetweb.obj"
@@ -46,12 +48,12 @@ debug:
4648
@- cd $(MAKEDIR)/dist/debug
4749
@echo Build WebUI Library (MSVC Debug Static)...
4850
@cl /Zl /Zi $(CIVETWEB_BUILD_FLAGS) $(CIVETWEB_DEFINE_FLAGS)
49-
@cl /Zl /Zi $(WEBUI_BUILD_FLAGS) /D WEBUI_LOG
51+
@cl /Zl /Zi $(WEBUI_BUILD_FLAGS) $(WARNING_LOG) /D WEBUI_LOG
5052
@lib $(LIB_STATIC_OUT)
5153
# Dynamic with Debug info
5254
@echo Build WebUI Library (MSVC Debug Dynamic)...
5355
@cl /Zi $(CIVETWEB_BUILD_FLAGS) $(CIVETWEB_DEFINE_FLAGS)
54-
@cl /Zi $(WEBUI_BUILD_FLAGS) /D WEBUI_LOG
56+
@cl /Zi $(WEBUI_BUILD_FLAGS) $(WARNING_LOG) /D WEBUI_LOG
5557
@link $(LIB_DYN_OUT)
5658
# Clean
5759
@- del *.obj >nul 2>&1
@@ -65,12 +67,12 @@ release:
6567
# Static Release
6668
@echo Build WebUI Library (MSVC Release Static)...
6769
@cl /Zl $(CIVETWEB_BUILD_FLAGS) $(CIVETWEB_DEFINE_FLAGS)
68-
@cl /Zl $(WEBUI_BUILD_FLAGS)
70+
@cl /Zl $(WEBUI_BUILD_FLAGS) $(WARNING_RELEASE)
6971
@lib $(LIB_STATIC_OUT)
7072
# Dynamic Release
7173
@echo Build WebUI Library (MSVC Release Dynamic)...
7274
@cl $(CIVETWEB_BUILD_FLAGS) $(CIVETWEB_DEFINE_FLAGS)
73-
@cl $(WEBUI_BUILD_FLAGS)
75+
@cl $(WEBUI_BUILD_FLAGS) $(WARNING_RELEASE)
7476
@link $(LIB_DYN_OUT)
7577
# Clean
7678
@- del *.pdb >nul 2>&1

0 commit comments

Comments
 (0)