diff --git a/binaries/mac64/ip2net b/binaries/mac64/ip2net index 49ceca6..a1b265c 100755 Binary files a/binaries/mac64/ip2net and b/binaries/mac64/ip2net differ diff --git a/binaries/mac64/mdig b/binaries/mac64/mdig index 4789cac..f4c49ee 100755 Binary files a/binaries/mac64/mdig and b/binaries/mac64/mdig differ diff --git a/binaries/mac64/tpws b/binaries/mac64/tpws index 3b67a1d..8302d6a 100755 Binary files a/binaries/mac64/tpws and b/binaries/mac64/tpws differ diff --git a/ip2net/Makefile b/ip2net/Makefile index 5048302..515e4c3 100644 --- a/ip2net/Makefile +++ b/ip2net/Makefile @@ -1,7 +1,6 @@ CC ?= gcc CFLAGS += -std=gnu99 -Wno-logical-op-parentheses -O3 CFLAGS_BSD = -Wno-address-of-packed-member -Wno-switch -CFLAGS_MAC = -mmacosx-version-min=10.8 LIBS = LIBS_WIN = -lws2_32 SRC_FILES = ip2net.c qsort.c @@ -15,8 +14,11 @@ bsd: $(SRC_FILES) $(CC) -s $(CFLAGS) $(CFLAGS_BSD) -o ip2net $(SRC_FILES) $(LDFLAGS) $(LIBS) mac: $(SRC_FILES) - $(CC) $(CFLAGS) $(CFLAGS_BSD) $(CFLAGS_MAC) -o ip2net $(SRC_FILES) $(LDFLAGS) $(LIBS) - strip ip2net + $(CC) $(CFLAGS) $(CFLAGS_BSD) -o ip2neta $(SRC_FILES) $(LDFLAGS) -target arm64-apple-macos10.8 $(LIBS) + $(CC) $(CFLAGS) $(CFLAGS_BSD) -o ip2netx $(SRC_FILES) $(LDFLAGS) -target x86_64-apple-macos10.8 $(LIBS) + strip ip2neta ip2netx + lipo -create -output ip2net ip2netx ip2neta + rm -f ip2netx ip2neta win: $(SRC_FILES) $(CC) $(CFLAGS) -o ip2net $(SRC_FILES) $(LDFLAGS) $(LIBS_WIN) diff --git a/mdig/Makefile b/mdig/Makefile index d346d0d..fe3761b 100644 --- a/mdig/Makefile +++ b/mdig/Makefile @@ -1,7 +1,6 @@ CC ?= gcc CFLAGS += -std=gnu99 -Wno-logical-op-parentheses -O3 CFLAGS_BSD = -Wno-address-of-packed-member -Wno-switch -CFLAGS_MAC = -mmacosx-version-min=10.8 LIBS = -lpthread LIBS_WIN = -lws2_32 SRC_FILES = *.c @@ -15,8 +14,11 @@ bsd: $(SRC_FILES) $(CC) -s $(CFLAGS) $(CFLAGS_BSD) -o mdig $(SRC_FILES) $(LDFLAGS) $(LIBS) mac: $(SRC_FILES) - $(CC) $(CFLAGS) $(CFLAGS_BSD) $(CFLAGS_MAC) -o mdig $(SRC_FILES) $(LDFLAGS) $(LIBS) - strip mdig + $(CC) $(CFLAGS) $(CFLAGS_BSD) -o mdiga $(SRC_FILES) $(LDFLAGS) -target arm64-apple-macos10.8 $(LIBS_BSD) + $(CC) $(CFLAGS) $(CFLAGS_BSD) -o mdigx $(SRC_FILES) $(LDFLAGS) -target x86_64-apple-macos10.8 $(LIBS_BSD) + strip mdiga mdigx + lipo -create -output mdig mdigx mdiga + rm -f mdigx mdiga win: $(SRC_FILES) $(CC) $(CFLAGS) -o mdig -static $(SRC_FILES) $(LDFLAGS) $(LIBS_WIN) diff --git a/nfq/Makefile b/nfq/Makefile index d5d15ec..96747af 100644 --- a/nfq/Makefile +++ b/nfq/Makefile @@ -1,7 +1,6 @@ CC ?= gcc CFLAGS += -std=gnu99 -Wno-logical-op-parentheses -O3 CFLAGS_BSD = -Wno-address-of-packed-member -Wno-switch -CFLAGS_MAC = -mmacosx-version-min=10.8 LIBS = -lnetfilter_queue -lnfnetlink -lz LIBS_BSD = -lz SRC_FILES = *.c crypto/*.c diff --git a/tpws/Makefile b/tpws/Makefile index eb8abb7..3b9728a 100644 --- a/tpws/Makefile +++ b/tpws/Makefile @@ -1,7 +1,6 @@ CC ?= gcc CFLAGS += -std=gnu99 -Wno-logical-op-parentheses -O3 CFLAGS_BSD = -Wno-address-of-packed-member -Wno-switch -CFLAGS_MAC = -mmacosx-version-min=10.8 LIBS = -lz SRC_FILES = *.c @@ -14,8 +13,11 @@ bsd: $(SRC_FILES) $(CC) -s $(CFLAGS) $(CFLAGS_BSD) -Iepoll-shim/include -o tpws $(SRC_FILES) epoll-shim/src/*.c $(LDFLAGS) $(LIBS) mac: $(SRC_FILES) - $(CC) $(CFLAGS) $(CFLAGS_BSD) $(CFLAGS_MAC) -Iepoll-shim/include -Imacos -o tpws $(SRC_FILES) epoll-shim/src/*.c $(LDFLAGS) $(LIBS) - strip tpws + $(CC) $(CFLAGS) $(CFLAGS_BSD) -Iepoll-shim/include -Imacos -o tpwsa -target arm64-apple-macos10.8 $(SRC_FILES) epoll-shim/src/*.c $(LDFLAGS) $(LIBS) + $(CC) $(CFLAGS) $(CFLAGS_BSD) -Iepoll-shim/include -Imacos -o tpwsx -target x86_64-apple-macos10.8 $(SRC_FILES) epoll-shim/src/*.c $(LDFLAGS) $(LIBS) + strip tpwsa tpwsx + lipo -create -output tpws tpwsx tpwsa + rm -f tpwsx tpwsa clean: rm -f tpws *.o