From ade659e617922171ad1b678a51765ba2046c27d8 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Mon, 21 Jul 2014 01:03:01 +0200 Subject: Fixed ezSAT stand-alone build --- libs/ezsat/Makefile | 3 ++- libs/ezsat/ezminisat.cc | 9 ++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/libs/ezsat/Makefile b/libs/ezsat/Makefile index e831cc6f0..1dcb5d15b 100644 --- a/libs/ezsat/Makefile +++ b/libs/ezsat/Makefile @@ -3,7 +3,8 @@ CC = clang CXX = clang CXXFLAGS = -MD -Wall -Wextra -ggdb CXXFLAGS += -std=c++11 -O0 -LDLIBS = -lminisat -lm -lstdc++ +LDLIBS = ../minisat/Options.cc ../minisat/SimpSolver.cc ../minisat/Solver.cc ../minisat/System.cc -lm -lstdc++ + all: demo_vec demo_bit demo_cmp testbench puzzle3d diff --git a/libs/ezsat/ezminisat.cc b/libs/ezsat/ezminisat.cc index caee73f88..6a6c075f5 100644 --- a/libs/ezsat/ezminisat.cc +++ b/libs/ezsat/ezminisat.cc @@ -28,13 +28,8 @@ #include #include -#ifdef _YOSYS_ -# include "libs/minisat/Solver.h" -# include "libs/minisat/SimpSolver.h" -#else -# include -# include -#endif +#include "../minisat/Solver.h" +#include "../minisat/SimpSolver.h" ezMiniSAT::ezMiniSAT() : minisatSolver(NULL) { -- cgit v1.2.3