From 2f422d46c526f6714deb25f3f8b1edee14bf6437 Mon Sep 17 00:00:00 2001 From: Justin Ramos Date: Mon, 31 Dec 2018 22:47:00 -0800 Subject: [PATCH] use /usr/local/opt/openssl symlink, ignore a.out --- .gitignore | 1 + src/bitmsghash/Makefile | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 104f54c1..2bcb5340 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ src/.settings/ src/**/.dll src/**/*.o src/**/*.so +src/**/a.out build/lib.* build/temp.* dist diff --git a/src/bitmsghash/Makefile b/src/bitmsghash/Makefile index c4fb4ab5..7a494c39 100644 --- a/src/bitmsghash/Makefile +++ b/src/bitmsghash/Makefile @@ -1,14 +1,14 @@ UNAME_S := $(shell uname -s) ifeq ($(UNAME_S),Darwin) - CCFLAGS += -I/usr/local/Cellar/openssl/1.0.2d_1/include - LDFLAGS += -L/usr/local/Cellar/openssl/1.0.2d_1/lib + CCFLAGS += -I/usr/local/opt/openssl/include + LDFLAGS += -L/usr/local/opt/openssl/lib else ifeq ($(UNAME_S),MINGW32_NT-6.1) CCFLAGS += -IC:\OpenSSL-1.0.2j-mingw\include -D_WIN32 -march=native LDFLAGS += -static-libgcc -LC:\OpenSSL-1.0.2j-mingw\lib -lwsock32 -o bitmsghash32.dll -Wl,--out-implib,bitmsghash.a else LDFLAGS += -lpthread -o bitmsghash.so endif - + all: bitmsghash.so powtest: @@ -22,4 +22,3 @@ bitmsghash.o: clean: rm -f bitmsghash.o bitmsghash.so bitmsghash*.dll -