Commit b6932792 authored by Hidetomo Nabeshima's avatar Hidetomo Nabeshima

Merge branch 'manyglucose' of into manyglucose

parents a704d7de f6218855
......@@ -14,8 +14,8 @@ R64COBJSPB= $(addsuffix x, $(COBJSPB))
glueminisat/core/Solver.o glueminisat/simp/SimpSolver.o glueminisat/utils/System.o \
manyglucose/parallel/MultiSolvers.o manyglucose/parallel/SharedCompanion.o manyglucose/parallel/ParallelSolver.o manyglucose/parallel/SolverConfiguration.o manyglucose/parallel/PrdClausesQueueMgr.o manyglucose/parallel/PeriodClausesBuffer.o manyglucose/parallel/SolverCompanion.o manyglucose/parallel/PrdClauses.o manyglucose/parallel/PrdClausesQueue.o manyglucose/simp/SimpSolver.o manyglucose/core/Solver.o manyglucose/mtl/Clone.o es1sat/core/Solver.o manyglucose/utils/System.o \
es1sat/simp/SimpSolver.o \
manyglucose/parallel/MultiSolvers.o manyglucose/parallel/PrdClauses.o manyglucose/parallel/PrdClausesQueueMgr.o manyglucose/parallel/SolverCompanion.o manyglucose/parallel/ParallelSolver.o manyglucose/parallel/SharedCompanion.o manyglucose/parallel/PeriodClausesBuffer.o manyglucose/parallel/SolverConfiguration.o manyglucose/parallel/PrdClausesQueue.o manyglucose/mtl/Clone.o manyglucose/utils/System.o manyglucose/core/Solver.o manyglucose/simp/SimpSolver.o \
es1sat/core/Solver.o es1sat/simp/SimpSolver.o \
ccminisat/core/Solver.o ccminisat/simp/SimpSolver.o
PCOBJS = $(addsuffix p, $(COBJS))
DCOBJS = $(addsuffix d, $(COBJS))
......@@ -26,7 +26,7 @@ EXEC = naps
#CXX = g++6
#LDFLAGS += -Wl,-rpath=/usr/local/lib/gcc6
CXX = g++
CXX ?= g++
#CXX = icpc
CFLAGS = -Wall -ffloat-store
#CFLAGS += -IADTs -include Global.h -include Main.h -D_FILE_OFFSET_BITS=64
......@@ -38,6 +38,7 @@ COPTIMIZE = -O3 -fomit-frame-pointer -falign-loops=4 -falign-functions=16 -fopti
LDFLAGS += -L/usr/local/lib -L/opt/local/lib
LDFLAGS += -L/usr/lib
LDFLAGS += -lpthread
.PHONY : s p d r x build clean cleanPB depend
......@@ -89,7 +90,7 @@ clean:
## Build rule
%.o %.op %.od %.or %.ox: %.C
@echo Compiling: $<
@$(CXX) $(CFLAGS) -c -o $@ $<
$(CXX) $(CFLAGS) -c -o $@ $<
MROOT=$(CURDIR)/glueminisat $(MAKE) -C $(CURDIR)/glueminisat/core
......@@ -178,27 +179,27 @@ ccminisat/simp/SimpSolver.ox: ccminisat/simp/
## Linking rules (standard/profile/debug/release)
@echo Linking $(EXEC)
@$(CXX) $(COBJS) $(LDFLAGS) -lz -lgmp -Wall -o $@
$(CXX) $(COBJS) $(LDFLAGS) -lz -lgmp -Wall -o $@
$(EXEC)_profile: $(PCOBJS)
@echo Linking $@
@$(CXX) $(PCOBJS) $(LDFLAGS) -lz -lgmp -Wall -pg -o $@
$(CXX) $(PCOBJS) $(LDFLAGS) -lz -lgmp -Wall -pg -o $@
$(EXEC)_debug: $(DCOBJS)
@echo Linking $@
@$(CXX) $(DCOBJS) $(LDFLAGS) -lz -lgmp -Wall -o $@
$(CXX) $(DCOBJS) $(LDFLAGS) -lz -lgmp -Wall -o $@
$(EXEC)_release: $(RCOBJS)
@echo Linking $@
@$(CXX) $(RCOBJS) $(LDFLAGS) -lz -Wall -o $@
$(CXX) $(RCOBJS) $(LDFLAGS) -lz -Wall -o $@
$(EXEC)_bignum_static: $(RCOBJS)
@echo Linking $@
@$(CXX) --static $(RCOBJS) $(LDFLAGS) -lz -lgmp -Wall -o $@
$(CXX) --static $(RCOBJS) $(LDFLAGS) -lz -lgmp -Wall -o $@
$(EXEC)_64-bit_static: $(R64COBJS)
@echo Linking $@
@$(CXX) --static $(R64COBJS) $(LDFLAGS) -lz -Wall -o $@
$(CXX) --static $(R64COBJS) $(LDFLAGS) -lz -Wall -o $@
## Make dependencies
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment