From 29699a12bac77bc92ccbbd1032844338235b0c2e Mon Sep 17 00:00:00 2001
From: stf <7o5rfu92t@ctrlc.hu>
Date: Sun, 2 Mar 2025 00:28:06 +0100
Subject: [PATCH 1/2] [fix] trying to get mingw build to work

---
 src/makefile | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/makefile b/src/makefile
index 75a2505..ace284d 100644
--- a/src/makefile
+++ b/src/makefile
@@ -77,23 +77,14 @@ asan: DEFINES=-DTRACE -DNORANDOM
 asan: LDFLAGS+= -fsanitize=address -static-libasan
 asan: all
 
-mingw64:
-	 CFLAGS=-march=native -Wall -O2 -g -fstack-protector-strong -D_FORTIFY_SOURCE=2 -fasynchronous-unwind-tables -fpic -Werror=format-security -Werror=implicit-function-declaration -ftrapv $(DEFINES)
-	ifeq ($(ARCH),x86_64)
-	   CFLAGS+=-fcf-protection=full
-	endif
-	ifeq ($(ARCH),parisc64)
-	else ifeq ($(ARCH),parisc64)
-	else
-	   CFLAGS+=-fstack-clash-protection
-	endif
+mingw64: CFLAGS=-march=native -Wall -O2 -g -fstack-protector-strong -D_FORTIFY_SOURCE=2 -fasynchronous-unwind-tables -fpic -Werror=format-security -Werror=implicit-function-declaration -ftrapv $(DEFINES) -Iwin/libsodium-win64/include/sodium -Iwin/libsodium-win64/include -I$(OPRFINCDIR)
 mingw64: CC=x86_64-w64-mingw32-gcc
-mingw64: LIBS=-L. -lws2_32 -Lwin/libsodium-win64/lib/ -Wl,-Bstatic -lsodium -Wl,-Bdynamic
+mingw64: LIBS=-L. -lws2_32 -Lwin/libsodium-win64/lib/ -lsodium -Wl,-Bdynamic -loprf
 mingw64: INC=-Iwin/libsodium-win64/include/sodium -Iwin/libsodium-win64/include
 mingw64: SOEXT=dll
 mingw64: EXT=.exe
 mingw64: MAKETARGET=mingw
-mingw64: win/libsodium-win64 libopaque.$(SOEXT) tests utils/opaque
+mingw64: win/libsodium-win64 libopaque.$(SOEXT)
 
 TESTS=tests/opaque-test$(EXT) tests/opaque-munit$(EXT)
 ifeq ($(shell test -e $(OPRFHOME)/oprf.c && echo -n yes),yes)

From 010bf40ce6ecc22f8f272ad00d110fa7f807a10c Mon Sep 17 00:00:00 2001
From: stf <7o5rfu92t@ctrlc.hu>
Date: Sun, 2 Mar 2025 00:53:54 +0100
Subject: [PATCH 2/2] [mod] small fixes to makefile for mingw-build

---
 src/makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/makefile b/src/makefile
index ace284d..bfbe3d3 100644
--- a/src/makefile
+++ b/src/makefile
@@ -45,7 +45,7 @@ endif
 
 ifdef OPRFHOME
 	OPRFINCDIR=$(OPRFHOME)
-	LDFLAGS+= -L$(OPRFHOME)
+	LDFLAGS+= -L$(OPRFHOME) -L$(OPRFHOME)/noise_xk
 else
 	OPRFINCDIR=/usr/include/oprf
 endif
@@ -79,7 +79,7 @@ asan: all
 
 mingw64: CFLAGS=-march=native -Wall -O2 -g -fstack-protector-strong -D_FORTIFY_SOURCE=2 -fasynchronous-unwind-tables -fpic -Werror=format-security -Werror=implicit-function-declaration -ftrapv $(DEFINES) -Iwin/libsodium-win64/include/sodium -Iwin/libsodium-win64/include -I$(OPRFINCDIR)
 mingw64: CC=x86_64-w64-mingw32-gcc
-mingw64: LIBS=-L. -lws2_32 -Lwin/libsodium-win64/lib/ -lsodium -Wl,-Bdynamic -loprf
+mingw64: LIBS=-loprf -loprf-noiseXK -L. -lws2_32 -Lwin/libsodium-win64/lib/ -lsodium -Wl,-Bdynamic
 mingw64: INC=-Iwin/libsodium-win64/include/sodium -Iwin/libsodium-win64/include
 mingw64: SOEXT=dll
 mingw64: EXT=.exe