macos aarch64

CMakeLists.txt

@@ -1,11 +1 @@
-set(MONERO_CRYPTO_DIR ${CMAKE_CURRENT_LIST_DIR})
-set(MONERO_CRYPTO_NAMESPACE amd64_64_24k)
-set(MONERO_GENERATED_HEADERS_DIR "${CMAKE_BINARY_DIR}/generated_include")
-set(MONERO_CRYPTO_LIBRARY "amd64-64-24k")
-set(HEADER_FILE "${MONERO_GENERATED_HEADERS_DIR}/crypto/wallet/ops.h")
-
-message(STATUS "writing ${HEADER_FILE}")
-configure_file("${MONERO_CRYPTO_DIR}/src/crypto.h.in" ${HEADER_FILE})
-
-message(STATUS "${MONERO_CRYPTO_DIR}/src")
-add_subdirectory("${MONERO_CRYPTO_DIR}/src" ${CMAKE_BINARY_DIR}/monero_crypto_src)
+add_subdirectory("src" ${CMAKE_BINARY_DIR}/monero_crypto_src)

functions.cmake

@@ -0,0 +1,10 @@
+function(generate_supercop_config)
+    set(MONERO_CRYPTO_DIR ${CMAKE_CURRENT_LIST_DIR})
+    set(MONERO_CRYPTO_NAMESPACE amd64_64_24k)
+    set(MONERO_GENERATED_HEADERS_DIR "${CMAKE_BINARY_DIR}/generated_include")
+    set(MONERO_CRYPTO_LIBRARY "amd64-64-24k")
+    set(HEADER_FILE "${MONERO_GENERATED_HEADERS_DIR}/crypto/wallet/ops.h")
+
+    message(STATUS "writing ${HEADER_FILE}")
+    configure_file("${MONERO_CRYPTO_DIR}/src/crypto.h.in" ${HEADER_FILE})
+endfunction()

src/CMakeLists.txt

@@ -27,4 +27,6 @@
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Only build libraries when targeted
-add_subdirectory(amd64)
+if(ARCH_ID STREQUAL "amd64")
+    add_subdirectory(amd64)
+endif()

src/amd64/CMakeLists.txt

@@ -67,6 +67,8 @@ add_library("monero-crypto-${LIBNAME}" STATIC
     "${LIBFOLDER}/ge25519_unpackneg.c"
     "${LIBFOLDER}/sc25519_from32bytes.c"
     "${LIBFOLDER}/sc25519_window4.c"
+    "${LIBFOLDER}/fe25519_add.s"
+    "${LIBFOLDER}/fe25519_sub.s"
     ${AMD64_PERF_SOURCES})
 
 set_property(TARGET "monero-crypto-${LIBNAME}" PROPERTY POSITION_INDEPENDENT_CODE ON)
@@ -79,18 +81,4 @@ target_include_directories("monero-crypto-${LIBNAME}"
         PUBLIC $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/wownero/>
         )
 
-#install(TARGETS "monero-crypto-${LIBNAME}"
-#    EXPORT "monero-crypto-${LIBNAME}Targets"
-#    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-#    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/monero/
-#    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/monero/
-#    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/wownero/
-#    )
-#
-#install(EXPORT "monero-crypto-${LIBNAME}Targets"
-#    FILE "monero-crypto-${LIBNAME}Targets.cmake"
-#    NAMESPACE monero::
-#    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/monero
-#    )
-
 wownero_install_library("monero-crypto-${LIBNAME}")