Fixed ezSAT stand-alone build

diff --git a/libs/ezsat/Makefile b/libs/ezsat/Makefile
index e831cc6f0bfaec594b01885adf2b72a25c4e2bce..1dcb5d15b6ddcc6bff19fe55b4eefe57148ceb8f 100644 (file)
--- 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 caee73f885f3e7a4f6112f2a526ede9189599c2f..6a6c075f55c70c999b1ecc92363c6152d2ee43d0 100644 (file)
--- a/libs/ezsat/ezminisat.cc
+++ b/libs/ezsat/ezminisat.cc
@@ -28,13 +28,8 @@
 #include <csignal>
 #include <cinttypes>
 
-#ifdef _YOSYS_
-#  include "libs/minisat/Solver.h"
-#  include "libs/minisat/SimpSolver.h"
-#else
-#  include <minisat/core/Solver.h>
-#  include <minisat/simp/SimpSolver.h>
-#endif
+#include "../minisat/Solver.h"
+#include "../minisat/SimpSolver.h"
 
 ezMiniSAT::ezMiniSAT() : minisatSolver(NULL)
 {