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 0000000..8b8eaf6 Binary files /dev/null and b/nfq/windows/res/32/winicon.o differ diff --git a/nfq/windows/res/32/winmanifest.o b/nfq/windows/res/32/winmanifest.o new file mode 100644 index 0000000..0db470d Binary files /dev/null and b/nfq/windows/res/32/winmanifest.o differ 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