From 8e336b746cecb43a8881629c6cde74affc886426 Mon Sep 17 00:00:00 2001
From: bol-van <none@none.none>
Date: Wed, 16 Oct 2024 20:00:23 +0300
Subject: [PATCH] winws: win32 build

---
 nfq/Makefile                           |  13 ++++++++++---
 nfq/windows/res/32/winicon.o           | Bin 0 -> 4550 bytes
 nfq/windows/res/32/winmanifest.o       | Bin 0 -> 1364 bytes
 nfq/windows/res/{ => 64}/winicon.o     | Bin
 nfq/windows/res/{ => 64}/winmanifest.o | Bin
 5 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 nfq/windows/res/32/winicon.o
 create mode 100644 nfq/windows/res/32/winmanifest.o
 rename nfq/windows/res/{ => 64}/winicon.o (100%)
 rename nfq/windows/res/{ => 64}/winmanifest.o (100%)

diff --git a/nfq/Makefile b/nfq/Makefile
index 7d0a947..fb8c900 100644
--- a/nfq/Makefile
+++ b/nfq/Makefile
@@ -5,7 +5,11 @@ CFLAGS_MAC = -mmacosx-version-min=10.8
 CFLAGS_CYGWIN = -Wno-address-of-packed-member -static
 LIBS_LINUX = -lnetfilter_queue -lnfnetlink -lz
 LIBS_BSD = -lz
-LIBS_CYGWIN = -lz -Lwindows/windivert -Iwindows -lwindivert -lwlanapi -lole32 -loleaut32 -luuid
+LIBS_CYGWIN = -lz -Lwindows/windivert -Iwindows -lwlanapi -lole32 -loleaut32 -luuid
+LIBS_CYGWIN32 = -lwindivert32
+LIBS_CYGWIN64 = -lwindivert64
+RES_CYGWIN32 = windows/res/32/winmanifest.o windows/res/32/winicon.o
+RES_CYGWIN64 = windows/res/64/winmanifest.o windows/res/64/winicon.o
 SRC_FILES = *.c crypto/*.c
 
 all: nfqws
@@ -23,8 +27,11 @@ mac: $(SRC_FILES)
 	lipo -create -output dvtws dvtwsx dvtwsa
 	rm -f dvtwsx dvtwsa
 
-cygwin:
-	$(CC) -s $(CFLAGS) $(CFLAGS_CYGWIN) -o winws $(SRC_FILES) $(LDFLAGS) $(LIBS_CYGWIN) windows/res/winmanifest.o windows/res/winicon.o
+cygwin64:
+	$(CC) -s $(CFLAGS) $(CFLAGS_CYGWIN) -o winws $(SRC_FILES) $(LDFLAGS) $(LIBS_CYGWIN) $(LIBS_CYGWIN64) $(RES_CYGWIN64)
+cygwin32:
+	$(CC) -s $(CFLAGS) $(CFLAGS_CYGWIN) -o winws $(SRC_FILES) $(LDFLAGS) $(LIBS_CYGWIN) $(LIBS_CYGWIN32) $(RES_CYGWIN32)
+cygwin: cygwin64
 
 clean:
 	rm -f nfqws dvtws winws.exe
diff --git a/nfq/windows/res/32/winicon.o b/nfq/windows/res/32/winicon.o
new file mode 100644
index 0000000000000000000000000000000000000000..8b8eaf6b78e7022e396803babe9287de885c35cb
GIT binary patch
literal 4550
zcmeHLYitx%6h1R^XJ==2w~wW4(^6o;R%k1w#Gr`O)}%rqKzRnFRcf`B(r6IEqirnZ
zAwe69iTDFhBT<a;6+vT=9|{CR<XLHgmPZTxfDnupX}i1K$MM|RUEFS`wZ-L^-sJ3k
z%y-Ur&bjB#%+72<0N%bz1PG3pkh6Nt>gV;<;7=J{n?}QTspm~3DS+I=eEfG4L86Hh
zpdpU>dDK%E(FEQ86oYk@^;sl6LFZY~=aK*%{}v%WAo(PLenPE?{7VW?s2@+_Bq<;f
z^brjR{~L8&252H!Ebjr6-Gsq@B`Kvj!iEIQR0Fc9+YoOudtq4eM|3Ti<_JZD;d~f5
zrV|dgBb@%dk4Oivp_o^U5NE#`(tQv#YYU`jcftPCeem3d>GR7dj2h=7e6ayv^wK(5
z_?#OKoI$9nMYx1_g`GuY<(m*RTN^12*A+F}DVYDPA6mV4agjQ(q6XQAXHc5+0?*~T
zXflKOdRSEM*6p3V)yt;PiYSvUAt}WNcE>@|O#)di2b1E4Ra<<9K9CLhcn?Z*D>(mp
z1HR~`Ab&*Mz2c#DcJvPv^A{l4lYa^+XM$O6hxLttXe^)0Cjv3!7k(xF&HE5+i9SfM
zZzg^P6t$7~J+SYGUik|95-WbGg<@H|i)t_NHt`nfv0H2hAa_bP9Bwn@j%EDfdE(#t
z8G>r<0ZFPLet~L#52TLjf=_?E@BBO#;R5-v=NJlU>3&Fb?A3kXz9{Byc;^d4A7YjN
z@P4ubmr<OU7ohq(r0)UW3)ON9UfX?N>yOu-yz_g0{(WFg*g@P1n6-MaSY5E=W5d{E
zx&PA7RQpwL@Y=sl+?jgp7TZxMEcU?Jj{DBfV-e4JkyUIBP~2V;{-{g>t8G8nhr8hG
zW<wuhzW=AZC>1TI`;VhV&jG&|o0L{~WlL=Lztz_}o{NamH*F|n<ofA(c9FO<NM;as
z2NajO;M|?wc*+-$jeCm!%M%DCRlV%7GXZ4FUq#CMCF0fe*fnc2ETMZl=Q5IIE0FCy
zF_imnDP-k#!Y>{}d+gA46my>lQ2gh0et^e8)owz;EEgQVVW?v|;zA*7vY+rJA)SFb
zh0fP8djIfBs@B6)jrU&Sa0kWW0SleKIQxwVBR0^q_qk3O$8}`0*~e7XPy6Gid&Nn@
zn<8}nX;_vvBIQm)-OD&G-PuLpT9UC5Vq}ZIf^keO*Lh~?JWO^Z@wm%KhT0a7agMyb
zvuPtv$R5{8%9TSfP|0<wD@$=iYBGQCSv&;YF!X=^|91WtI7g@H^_QEI$?Ly5To{As
zt0zv#>|9Cpmzv_>^|xRUI?<54VfKVSdHv6vo*$59c~>-`zquqyy9=M3>Z>S!8WR%Y
zyo8(9A9jHCI8hY6+c&Spb*n3pF~-ke@&NeorBueG?p4)gxOCARlthuA|M>95q4Z|6
z^4+W%1wNjGX;U9|D~jm?=?9<t#)h&Llj+i9k52N`u3d?fCT646q8>Gd4r(<=X3V`|
z&5QW<oApS(cxfLzs%pMU+7E>-P@byEx2uvQdW)XQ^EYm*!FjW%qbxI?`<yWDUV7Tg
zO4Y2mcs`r9*WtqAA|$>5*?J^oZzko*RaLPJ8@Fx1rq}C;yAWy3C(Gi>d*O`MAs?1e
z9y+tLGCUKq$Md*6gh}N%QG{x$@$UMXm#}2XTzp{cXsT7_kt8UMw(~FN4#vcKn?-9U
zU-)^P9J0sEit;VhoX2X>t`TMvtvd$G)gd&*cL)#^s?!djIq&(JJ~vv6!05US@jl^7
zzHhX<e~ItN4=7hQ284!<C;;Ln0r7}L|4I3`5vMcwX@Gyx5OmiYLIEiH*A6~WAoAM`
KN6|+I`uz)Zp)tAu

literal 0
HcmV?d00001

diff --git a/nfq/windows/res/32/winmanifest.o b/nfq/windows/res/32/winmanifest.o
new file mode 100644
index 0000000000000000000000000000000000000000..0db470db84b71c566617915cfb078836c37037bf
GIT binary patch
literal 1364
zcmb_cUvJYe5KqMr(mnx?Chu<S*h!Nq?LY!VrAZ($2Cq(h-Yn%$vD0o9LgI7qY4}(?
zVz;!*Bq(UwNw&`C-<^Nwv+ry)3cSo72f<c58jX!L)yBG=ejWuu;Z*K0UOeu3Kz?}r
zRz|^7w{YXzt<7tr4W9hL?swm~@yU(v?u?xjr#DTFR$#2|+G$9~Bt+0woz(5+H2iS>
z8fPK0y=bMVyB4P58f<tvJ1&H^(3JHWIsev9!=-6YY;^^Vu(;8c>1?NZTy@Qfu+4Zy
zL)3^?E3o~=@UYo2LPc+uwx74E`_Eu3^lr}4LbWuyUvHPrVBqu89Rc#4(JNiUCD`5G
zaQD@XbL?HlXRv}A)qb9a-dP)XAsgLl+Z)k$CX9CeMfBI;MKmN*MEiWaZ{hA>A$ncv
z+A;lihIiop;<f||u~^i)a)G*bPw5%P=U0H{FHs3~ca3x_Jp?QoppjiJ7M<yl>J0km
zAl<b^7cN18Fy4py4FdW0J(|mD_yuA@DNiPtCOpNQRS6b}0!&CI0f0%S$k)O3+@H(j
zAP<&MmX*1{iOd}jRZ5&eEU}0=CvlvpoQa3wksaj0MXcfs7*1H3W6n9nrN}ER(_C`F
zMG7o?ARc3SkO@`kB&{YX&InM<W0vDQDNCF&NmMF{6q5}TwD~0N1>V0jlpJJ|0Z|h{
zV_d3|x!OR6U8NGtGbIxuXd?1WZMIB`Xz(gGUn9En*j-nNc5P*LyzNlFXL)%N3_GRo
KijM-{#(n`yR($^e

literal 0
HcmV?d00001

diff --git a/nfq/windows/res/winicon.o b/nfq/windows/res/64/winicon.o
similarity index 100%
rename from nfq/windows/res/winicon.o
rename to nfq/windows/res/64/winicon.o
diff --git a/nfq/windows/res/winmanifest.o b/nfq/windows/res/64/winmanifest.o
similarity index 100%
rename from nfq/windows/res/winmanifest.o
rename to nfq/windows/res/64/winmanifest.o