From 3899a719c1de43af9ae7697bdfb0b2bad3a0ab00 Mon Sep 17 00:00:00 2001 From: ValdikSS Date: Sat, 25 Dec 2021 01:50:34 +0300 Subject: [PATCH] Update Makefile, make fortify work on modern mingw compilers --- src/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Makefile b/src/Makefile index 655af95..edc18b9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -9,21 +9,22 @@ MINGWLIB = /usr/x86_64-w64-mingw32/lib/ TARGET = goodbyedpi.exe # Linking SSP does not work for some reason, the executable doesn't start. #LIBS = -L$(WINDIVERTLIBS) -Wl,-Bstatic -lssp -Wl,-Bdynamic -lWinDivert -lws2_32 -LIBS = -L$(WINDIVERTLIBS) -lWinDivert -lws2_32 +LIBS = -L$(WINDIVERTLIBS) -lWinDivert -lws2_32 -l:libssp.a CC = $(CPREFIX)gcc CCWINDRES = $(CPREFIX)windres CFLAGS = -std=c99 -pie -fPIE -pipe -I$(WINDIVERTHEADERS) -L$(WINDIVERTLIBS) \ - -O2 -D_FORTIFY_SOURCE=2 \ + -O2 -D_FORTIFY_SOURCE=2 -fstack-protector \ -Wall -Wextra -Wpedantic -Wformat=2 -Wshadow -Wstrict-aliasing=1 -Werror=format-security \ -Wfloat-equal -Wcast-align -Wsign-conversion \ #-fstack-protector-strong -LDFLAGS = -Wl,-O1,-pie,--dynamicbase,--nxcompat,--sort-common,--as-needed \ +LDFLAGS = -fstack-protector -Wl,-O1,-pie,--dynamicbase,--nxcompat,--sort-common,--as-needed \ -Wl,--image-base,0x140000000 -Wl,--disable-auto-image-base ifdef BIT64 LDFLAGS += -Wl,--high-entropy-va -Wl,--pic-executable,-e,mainCRTStartup else - LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup + CFLAGS += -m32 + LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup -m32 endif .PHONY: default all clean