Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes compilation for non-cmake builds on macOS #24

Closed
wants to merge 1 commit into from
Closed

fixes compilation for non-cmake builds on macOS #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/common/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ Cpp_Files := cosigner/cosigner_exception.cpp cosigner/cmp_setup_service.cpp cosi

Cpp_Objects := $(Cpp_Files:.cpp=.o)

Include_Paths := -I. -I../../include
Include_Paths := -I. -I../../include -I$(CUSTOM_INCLUDEDIR)

C_Flags := $(COMMON_CFLAGS) -fstack-protector-strong
C_Flags += $(Include_Paths)
C_Flags += -Wno-unknown-pragmas

Cpp_Flags := $(C_Flags) -std=c++17 -Wno-overloaded-virtual

Link_Flags := $(COMMON_CFLAGS) -shared -Wl,--version-script=lib.lds -Wl,--no-undefined -Wl,-Bstatic -lcrypto -Wl,-Bdynamic -lpthread -ldl
Link_Flags := $(COMMON_CFLAGS) -shared -L$(CUSTOM_LIBDIR) -lcrypto -lpthread -ldl

Lib_Name := libcosigner.so

Expand Down
4 changes: 2 additions & 2 deletions test/cosigner/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
App_Name := test

App_C_Flags := -g -I../../include -DTEST_ONLY
App_C_Flags := -g -I../../include -I$(CUSTOM_INCLUDEDIR) -DTEST_ONLY
App_Cpp_Flags := $(App_C_Flags) -std=c++17
App_Link_Flags := -L../../src/common -lcosigner -Wl,-Bstatic -lcrypto -Wl,-Bdynamic -luuid -lsecp256k1 -pthread -ldl
App_Link_Flags := -L../../src/common -lcosigner -L$(CUSTOM_LIBDIR) -lcrypto -luuid -lsecp256k1 -pthread -ldl

App_Cpp_Files := $(wildcard ./*.cpp) ../tests_main.cpp
App_Cpp_Objects := $(App_Cpp_Files:.cpp=.o)
Expand Down
4 changes: 2 additions & 2 deletions test/crypto/drng/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
App_Name := test

App_C_Flags := -g -Wall -Wextra -I../../../include
App_C_Flags := -g -Wall -Wextra -I../../../include -I$(CUSTOM_INCLUDEDIR)
App_Cpp_Flags := $(App_C_Flags) -std=c++17
App_Link_Flags := -lcrypto
App_Link_Flags := -L$(CUSTOM_LIBDIR) -lcrypto

all: $(App_Name)

Expand Down
4 changes: 2 additions & 2 deletions test/crypto/ed25519_algebra/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
App_Name := test

App_C_Flags := -g -Wall -Wextra -I../../../include
App_C_Flags := -g -Wall -Wextra -I../../../include -I$(CUSTOM_INCLUDEDIR)
App_Cpp_Flags := $(App_C_Flags) -std=c++17
App_Link_Flags := -Wl,-Bstatic -lcrypto -Wl,-Bdynamic -pthread -ldl
App_Link_Flags := -L$(CUSTOM_LIBDIR) -lcrypto -pthread -ldl

all: $(App_Name)

Expand Down
4 changes: 2 additions & 2 deletions test/crypto/paillier/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
App_Name := test

App_C_Flags := -g -Wall -Wextra -I../../../include
App_C_Flags := -g -Wall -Wextra -I../../../include -I$(CUSTOM_INCLUDEDIR)
App_Cpp_Flags := $(App_C_Flags) -std=c++17
App_Link_Flags := -lcrypto
App_Link_Flags := -L$(CUSTOM_LIBDIR) -lcrypto

all: $(App_Name)

Expand Down
4 changes: 2 additions & 2 deletions test/crypto/secp256k1_algebra/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
App_Name := test

App_C_Flags := -g -Wall -Wextra -I../../../include
App_C_Flags := -g -Wall -Wextra -I../../../include -I$(CUSTOM_INCLUDEDIR)
App_Cpp_Flags := $(App_C_Flags) -std=c++17
App_Link_Flags := -lcrypto
App_Link_Flags := -L$(CUSTOM_LIBDIR) -lcrypto

all: $(App_Name)

Expand Down
4 changes: 2 additions & 2 deletions test/crypto/shamir_secret_sharing/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
App_Name := test

App_C_Flags := -g -Wall -Wextra -I../../../include
App_C_Flags := -g -Wall -Wextra -I../../../include -I$(CUSTOM_INCLUDEDIR)
App_Cpp_Flags := $(App_C_Flags) -std=c++17
App_Link_Flags := -Wl,-Bstatic -lcrypto -Wl,-Bdynamic -pthread -ldl
App_Link_Flags := -L$(CUSTOM_LIBDIR) -lcrypto -pthread -ldl

all: $(App_Name)

Expand Down
4 changes: 2 additions & 2 deletions test/crypto/zero_knowledge_proof/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
App_Name := test

App_C_Flags := -g -O0 -Wall -Wextra -I../../../include
App_C_Flags := -g -O0 -Wall -Wextra -I../../../include -I$(CUSTOM_INCLUDEDIR)
App_Cpp_Flags := $(App_C_Flags) -std=c++17
App_Link_Flags := -Wl,-Bstatic -lcrypto -Wl,-Bdynamic -ldl -pthread
App_Link_Flags := -L$(CUSTOM_LIBDIR) -lcrypto -ldl -pthread

all: $(App_Name)

Expand Down
Loading