citizenaspirant
/
PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

use /usr/local/opt/openssl symlink, ignore a.out

This commit is contained in:
Justin Ramos 2018-12-31 22:47:00 -08:00
parent 1cdbb90f22
commit 2f422d46c5
No known key found for this signature in database
GPG Key ID: 4A33DDE9CB944DC3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,6 +10,7 @@ src/.settings/
src/**/.dll src/**/.dll
src/**/*.o src/**/*.o
src/**/*.so src/**/*.so
src/**/a.out
build/lib.* build/lib.*
build/temp.* build/temp.*
dist dist

7
src/bitmsghash/Makefile
View File

@ -1,14 +1,14 @@
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Darwin) ifeq ($(UNAME_S),Darwin)
CCFLAGS += -I/usr/local/Cellar/openssl/1.0.2d_1/include CCFLAGS += -I/usr/local/opt/openssl/include
LDFLAGS += -L/usr/local/Cellar/openssl/1.0.2d_1/lib LDFLAGS += -L/usr/local/opt/openssl/lib
else ifeq ($(UNAME_S),MINGW32_NT-6.1) else ifeq ($(UNAME_S),MINGW32_NT-6.1)
CCFLAGS += -IC:\OpenSSL-1.0.2j-mingw\include -D_WIN32 -march=native 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 LDFLAGS += -static-libgcc -LC:\OpenSSL-1.0.2j-mingw\lib -lwsock32 -o bitmsghash32.dll -Wl,--out-implib,bitmsghash.a
else else
LDFLAGS += -lpthread -o bitmsghash.so LDFLAGS += -lpthread -o bitmsghash.so
endif endif
all: bitmsghash.so all: bitmsghash.so
powtest: powtest:
@ -22,4 +22,3 @@ bitmsghash.o:
clean: clean:
rm -f bitmsghash.o bitmsghash.so bitmsghash*.dll rm -f bitmsghash.o bitmsghash.so bitmsghash*.dll