Merge remote-tracking branch 'origin/devel' into devel

CMakeLists.txt

@@ -110,7 +110,6 @@ set(LIBRARIES
         blocks
         lmdb
         ringct
-        ringct_basic
         device
         common
         mnemonics

cmake/FindMonero.cmake

@@ -57,11 +57,11 @@ foreach (l ${LIBS})
 
 endforeach()
 
-if (EXISTS ${MONERO_BUILD_DIR}/src/ringct/libringct_basic.a)
+#if (EXISTS ${MONERO_BUILD_DIR}/src/ringct/libringct_basic.a)
-	add_library(ringct_basic STATIC IMPORTED)
+#	add_library(ringct_basic STATIC IMPORTED)
-	set_property(TARGET ringct_basic
+#	set_property(TARGET ringct_basic
-			PROPERTY IMPORTED_LOCATION ${MONERO_BUILD_DIR}/src/ringct/libringct_basic.a)
+#			PROPERTY IMPORTED_LOCATION ${MONERO_BUILD_DIR}/src/ringct/libringct_basic.a)
-endif()
+#endif()
 
 
 message(STATUS ${MONERO_SOURCE_DIR}/build)