From 72d842b5e6a438fd56b4e179490326fdac1edfd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20B=C5=99inda?= Date: Tue, 9 Jan 2024 14:51:05 +0100 Subject: [PATCH 1/4] Add include and lib paths manually --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9b64380..0c6ba3f 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,8 @@ .PHONY: all clean test cpptest converttest verify quick-verify CXX= g++ -CXXFLAGS= -g -Wall -Wno-unused-function -std=c++17 -O2 +CXXFLAGS= -g -Wall -Wno-unused-function -std=c++17 -O2 -I /opt/homebrew/Cellar/glpk/5.0/include -L /opt/homebrew/Cellar/glpk/5.0/lib + LDFLAGS= -lz -lglpk LARGEFLAGS= -DLARGE_KMERS SRC= src From 245255a83407ed06dacd76f5d5dd3cbe2356cc64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20B=C5=99inda?= Date: Tue, 9 Jan 2024 16:19:40 +0100 Subject: [PATCH 2/4] Point to the top brew directory --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0c6ba3f..10ef031 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: all clean test cpptest converttest verify quick-verify CXX= g++ -CXXFLAGS= -g -Wall -Wno-unused-function -std=c++17 -O2 -I /opt/homebrew/Cellar/glpk/5.0/include -L /opt/homebrew/Cellar/glpk/5.0/lib +CXXFLAGS= -g -Wall -Wno-unused-function -std=c++17 -O2 -I/opt/homebrew/include -L/opt/homebrew/lib LDFLAGS= -lz -lglpk LARGEFLAGS= -DLARGE_KMERS From 53c05d8f5626f4aac4fbefa159b30568540cdbb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20B=C5=99inda?= Date: Tue, 9 Jan 2024 16:21:22 +0100 Subject: [PATCH 3/4] Move -L/opt/homebrew/lib to LDFLAGS --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 10ef031..2cafaed 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ .PHONY: all clean test cpptest converttest verify quick-verify CXX= g++ -CXXFLAGS= -g -Wall -Wno-unused-function -std=c++17 -O2 -I/opt/homebrew/include -L/opt/homebrew/lib +CXXFLAGS= -g -Wall -Wno-unused-function -std=c++17 -O2 -I/opt/homebrew/include -LDFLAGS= -lz -lglpk +LDFLAGS= -lz -lglpk -L/opt/homebrew/lib LARGEFLAGS= -DLARGE_KMERS SRC= src TESTS= tests From c0b391be62917445bba443630d1edff3e2eaf4a7 Mon Sep 17 00:00:00 2001 From: OndrejSladky Date: Tue, 9 Jan 2024 23:08:12 +0100 Subject: [PATCH 4/4] Makefile: Consistent spacing. --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 2cafaed..8b4130b 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,6 @@ CXX= g++ CXXFLAGS= -g -Wall -Wno-unused-function -std=c++17 -O2 -I/opt/homebrew/include - LDFLAGS= -lz -lglpk -L/opt/homebrew/lib LARGEFLAGS= -DLARGE_KMERS SRC= src