Compiler problems.

Makefile

@@ -25,7 +25,7 @@ MODULES := \
 	src/opt/cut src/opt/fxu src/opt/rwr src/opt/mfs src/opt/sim \
 	src/opt/ret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt \
 	src/opt/cgt src/opt/csw src/opt/dar src/opt/dau src/opt/sfm \
-	src/sat/bsat src/sat/csat src/sat/msat src/sat/psat src/sat/cnf src/sat/bmc \
+	src/sat/bsat src/sat/csat src/sat/msat src/sat/psat src/sat/cnf src/sat/bmc src/sat/bsat2 \
 	src/bool/bdc src/bool/deco src/bool/dec src/bool/kit src/bool/lucky \
 	src/bool/rsb src/bool/rpo \
 	src/proof/pdr src/proof/abs src/proof/bbr src/proof/llb src/proof/live \
@@ -94,6 +94,7 @@ include $(patsubst %, %/module.make, $(MODULES))
 
 OBJ := \
 	$(patsubst %.cc, %.o, $(filter %.cc, $(SRC))) \
+	$(patsubst %.cpp, %.o, $(filter %.cpp, $(SRC))) \
 	$(patsubst %.c, %.o,  $(filter %.c, $(SRC)))  \
 	$(patsubst %.y, %.o,  $(filter %.y, $(SRC))) 
 

src/sat/bsat2/IntTypes.h

@@ -34,6 +34,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 
 #else
 
+#   define __STDC_LIMIT_MACROS
 #   include <stdint.h>
 #   include <inttypes.h>
 

src/sat/bsat2/Options.h

@@ -236,7 +236,7 @@ class IntOption : public Option
     }
 };
 
-
+/*
 // Leave this out for visual C++ until Microsoft implements C99 and gets support for strtoll.
 #ifndef _MSC_VER
 
@@ -298,6 +298,7 @@ class Int64Option : public Option
     }
 };
 #endif
+*/
 
 //==================================================================================================
 // String option: