Bitwuzla update to 0.2.0-dev

ksmt-bitwuzla/bindings-native/CMakeLists.txt

@@ -5,24 +5,24 @@ PROJECT(bitwuzla_jni)
 FIND_PACKAGE(JNI REQUIRED)
 
 SET(CXX_STANDARD 17)
+SET(BITWUZLA_ROOT "${PROJECT_SOURCE_DIR}/bitwuzla")
 
-# Path to bitwuzla.h
-SET(BITWUZLA_INCLUDE "${PROJECT_SOURCE_DIR}/bitwuzla/include")
+# Path to bitwuzla.h, enums.h, option.h
+SET(BITWUZLA_INCLUDE "${BITWUZLA_ROOT}/include")
 
-# Path to Bitwuzla sources root (required for extensions)
-SET(BITWUZLA_SRC_ROOT "${PROJECT_SOURCE_DIR}/bitwuzla/src")
+# Path to bitwuzla library (libbitwuzla.so)
+SET(BITWUZLA_LIB "${BITWUZLA_ROOT}/build/src/${CMAKE_SHARED_LIBRARY_PREFIX}bitwuzla${CMAKE_SHARED_LIBRARY_SUFFIX}")
 
-# Path to bitwuzla library (libbitwuzla.so) 
-SET(BITWUZLA_LIB "${PROJECT_SOURCE_DIR}/bitwuzla/lib/${CMAKE_SHARED_LIBRARY_PREFIX}bitwuzla${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ADD_LIBRARY (bitwuzla_jni SHARED bitwuzla_jni.cpp bitwuzla_extension.cpp)
 
-ADD_LIBRARY (bitwuzla_jni SHARED bitwuzla_jni.cpp bitwuzla_extension.c)
+message(${BITWUZLA_INCLUDE})
 
 TARGET_INCLUDE_DIRECTORIES(bitwuzla_jni PRIVATE ${JNI_INCLUDE_DIRS})
+TARGET_INCLUDE_DIRECTORIES(bitwuzla_jni PRIVATE "./include"})
 TARGET_INCLUDE_DIRECTORIES(bitwuzla_jni PRIVATE ${BITWUZLA_INCLUDE})
 
-SET(BITWUZLA_SRC_INCLUDE "${BITWUZLA_SRC_ROOT}/bitwuzla/src")
-TARGET_INCLUDE_DIRECTORIES(bitwuzla_jni PRIVATE ${BITWUZLA_SRC_INCLUDE})
-
 SET(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
 
+# For Windows build, comment the first line, and uncomment the second one (link statically with libstdc++, ligbcc, lpthreads)
 TARGET_LINK_LIBRARIES(bitwuzla_jni PRIVATE ${BITWUZLA_LIB})
+#TARGET_LINK_LIBRARIES(bitwuzla_jni PRIVATE ${BITWUZLA_LIB} -static-libstdc++ -static-libgcc -Wl,-Bstatic -lstdc++ -lpthread -Wl,-Bdynamic)

ksmt-bitwuzla/bindings-native/bitwuzla_extension.cpp

@@ -0,0 +1,27 @@
+#include "bitwuzla/c/bitwuzla.h"
+#include <bitwuzla_extension.hpp>
+
+
+#if __cplusplus
+extern "C" {
+#endif
+
+void bitwuzla_extension_sort_dec_ref(BitwuzlaSort sort_id) {
+    bitwuzla_sort_dec_ref(sort_id);
+}
+
+void bitwuzla_extension_term_dec_ref(BitwuzlaTerm term_id) {
+    bitwuzla_term_dec_ref(term_id);
+}
+
+uint64_t bitwuzla_extension_bv_value_uint64(BitwuzlaTerm term) {
+    return bitwuzla_bv_value_uint64(term);
+}
+
+const char *bitwuzla_extension_bv_value_str(BitwuzlaTerm term, uint32_t base) {
+    return bitwuzla_bv_value_str(term, base);
+}
+
+#if __cplusplus
+}
+#endif