Fixed the helper files.

2 files changed, 7 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 4de89d8..85296fb 100644
--- a/Makefile
+++ b/Makefile
@@ -4,24 +4,17 @@ BLOSSOM_DIRS := $(BLOSSOM_DIR) $(BLOSSOM_DIR)/MinCost $(BLOSSOM_DIR)/GEOM
 BLOSSOM_SOURCES := $(filter-out $(BLOSSOM_DIR)/example.cpp, $(foreach dir, $(BLOSSOM_DIRS), $(wildcard $(dir)/*.cpp)))

 BLOSSOM_OBJS := $(patsubst %.cpp, %.o, $(BLOSSOM_SOURCES))

 

+TARGETS := excitation order uniform free_energy

+

 CFLAGS := -std=c++20 -stdlib=libc++ -flto -fopenmp -O3 -Os -march=native -mtune=native -D_NDEBUG -DPERFECT_MATCHING_DOUBLE

 CXX = clang++

 LD = ld.lld

 LIBS := -lrt

 

-all: excitation order uniform free_energy

-

-free_energy: free_energy.cpp $(BLOSSOM_DIR)/blossom5.o rbmp.hpp

-	$(CXX) $(CFLAGS) $(BLOSSOM_DIR)/blossom5.o free_energy.cpp -o $@

-

-uniform: uniform.cpp $(BLOSSOM_DIR)/blossom5.o rbmp.hpp

-	$(CXX) $(CFLAGS) $(BLOSSOM_DIR)/blossom5.o uniform.cpp -o $@

-

-order: order.cpp $(BLOSSOM_DIR)/blossom5.o rbmp.hpp

-	$(CXX) $(CFLAGS) $(BLOSSOM_DIR)/blossom5.o order.cpp -o $@

+all: $(TARGETS)

 

-excitation: excitation.cpp $(BLOSSOM_DIR)/blossom5.o

-	$(CXX) $(CFLAGS) $(BLOSSOM_DIR)/blossom5.o excitation.cpp -o $@

+$(TARGETS): %: %.cpp $(BLOSSOM_DIR)/blossom5.o rbmp.hpp

+	$(CXX) $(CFLAGS) $(BLOSSOM_DIR)/blossom5.o $@.cpp -o $@

 

 $(BLOSSOM_DIR)/blossom5.o: ${BLOSSOM_OBJS}

 	$(LD) -r -o $@ ${BLOSSOM_OBJS}

@@ -30,4 +23,4 @@ $(BLOSSOM_DIR)/blossom5.o: ${BLOSSOM_OBJS}
 	$(CXX) $(CFLAGS) $< -c -o $@

 

 clean:

-	rm -f ${BLOSSOM_OBJS} $(BLOSSOM_DIR)/blossom5.o rbmp

+	rm -f ${BLOSSOM_OBJS} $(BLOSSOM_DIR)/blossom5.o $(TARGETS)

diff --git a/compile_flags.txt b/compile_flags.txt
index 10ac621..a3c3d20 100644
--- a/compile_flags.txt
+++ b/compile_flags.txt
@@ -1,2 +1,3 @@
 -std=c++20
 -stdlib=libc++
+-DPERFECT_MATCHING_DOUBLE