[*.h,*.c,CMakeLists.txt] Carefully add architecture definition throughout to enable MSVC to build (mostly!) ; [acquire/acquire_crc32c.h] Fix inconsistent linkage error by removing symbol from this header (it's in checksums)

Author: SamuelMarks

.gitignore

@@ -1,5 +1,5 @@
 .idea
-cmake-build-*
+*-build-*
 build
 bin
 .DS_Store

acquire/CMakeLists.txt

@@ -73,6 +73,7 @@ include("${CMAKE_SOURCE_DIR}/cmake/generate_header_and_source_from_header_only.c
 if (LIBACQUIRE_HEADER_ONLY)
     message(STATUS "LIBACQUIRE_HEADER_ONLY")
     add_library("${LIBRARY_NAME}" INTERFACE "${_Header_Files}" "${Header_Files}")
+    target_compile_definitions("${LIBRARY_NAME}" PUBLIC "_${TARGET_ARCH}_")
     set(lib_vis "INTERFACE")
 else ()
     set(gen_header_files "")
@@ -245,6 +246,7 @@ else ()
 
     # Implement the internal implementation library as STATIC
     add_library("${LIBRARY_NAME}_impl" STATIC ${gen_header_files} ${gen_source_files})
+    target_compile_definitions("${LIBRARY_NAME}_impl" PUBLIC "_${TARGET_ARCH}_")
 
     if (DEFINED CHECKSUM_LIBRARIES)
         message(STATUS "[libacquire] Using var ${CHECKSUM_LIBRARIES} for checksums")

acquire/acquire_crc32c.h

@@ -26,21 +26,6 @@ extern "C" {
 #endif /* defined(WIN32) || defined(_WIN32) || defined(__WIN32__) ||           \
 defined(__NT__) */
 
-/**
- * @brief Verify the CRC32C checksum of a given file against an expected hash
- * string.
- *
- * Opens the file, computes its CRC32C checksum, then compares it with the input
- * hash string case-insensitively.
- *
- * @param filename Path to the file to be validated.
- * @param hash Expected CRC32C checksum string in hexadecimal (8 characters).
- *
- * @return true if computed checksum matches input hash, false otherwise or on
- * error.
- */
-extern bool crc32c(const char *filename, const char *hash);
-
 /*
  * Taken from FreeBSD implementation of CRC32C, specifically:
  * - usr.bin\cksum\crc32_algo.c @ d91d2b513eb30a226e87f0e52e2f9f232a2e1ca3

acquire/acquire_fileutils.h

@@ -26,8 +26,9 @@ extern "C" {
 
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
 
-#include <Fileapi.h>
 #include <acquire_common_defs.h>
+
+#include <Fileapi.h>
 #include <io.h>
 #include <wchar.h>
 

acquire/cli/CMakeLists.txt

@@ -49,6 +49,7 @@ set(Source_Exec_Files "main.c")
 source_group("${EXEC_NAME} Source Files" FILES "${Source_Exec_Files}")
 
 add_executable("${EXEC_NAME}" "${Source_Exec_Files}")
+target_compile_definitions("${EXEC_NAME}" PUBLIC "_${TARGET_ARCH}_")
 target_link_libraries(
         "${EXEC_NAME}"
         PRIVATE

acquire/cli/main.c

@@ -16,24 +16,20 @@
 #include <acquire_crc32c.h>
 #elif defined(USE_LIBRHASH) && USE_LIBRHASH
 #include <acquire_librhash.h>
+#else
+#warning "Checksum lib could be specified"
 #endif /* defined(USE_CRC32C) && USE_CRC32C */
 
 #if defined(USE_LIBCURL) && USE_LIBCURL
-
 #include <acquire_libcurl.h>
-
 #elif defined(USE_WININET) && USE_WININET
-
 #include <acquire_wininet.h>
-
 #elif defined(USE_LIBFETCH) && USE_LIBFETCH
-
 #include <acquire_libfetch.h>
-
 #elif defined(USE_OPENBSD_FTP) && USE_OPENBSD_FTP
-
 #include <acquire_openbsd_ftp.h>
-
+#else
+#error "Network lib must be specified"
 #endif /* defined(USE_LIBCURL) && USE_LIBCURL */
 
 #if (defined(USE_OPENSSL) && USE_OPENSSL) ||                                   \
@@ -50,7 +46,7 @@
 #include <acquire_miniz.h>
 #elif defined(USE_LIBARCHIVE) && USE_LIBARCHIVE
 #include <acquire_libarchive.h>
-#elif
+#else
 #error "Extract library must be specified"
 #endif /* defined(USE_MINIZ) && USE_MINIZ */
 

acquire/openbsd_ftp/CMakeLists.txt

@@ -33,6 +33,7 @@ endif (HAVE_VA_COPY)
 ###############################
 
 add_executable("${EXEC_NAME}" "${Header_Files}" "${Source_Files}")
+target_compile_definitions("${EXEC_NAME}" PUBLIC "_${TARGET_ARCH}_")
 
 target_link_libraries("${EXEC_NAME}" INTERFACE "${PROJECT_NAME}_compiler_flags")
 

acquire/tests/CMakeLists.txt

@@ -118,6 +118,7 @@ foreach (EXEC_NAME ${_targets})
             PROPERTIES COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION;USE_MINIZ=1")
 
     add_executable("${EXEC_NAME}" "${Header_Files}" "${Source_Files}")
+    target_compile_definitions("${EXEC_NAME}" PUBLIC "_${TARGET_ARCH}_")
 
     set_backend_definitions(${EXEC_NAME})
 
@@ -163,6 +164,7 @@ foreach (ARCHIVE_LIB ${_archives})
     source_group("${EXEC_NAME} Source Files" FILES "${Source_Files}")
 
     add_executable("${EXEC_NAME}" "${Header_Files}" "${Source_Files}")
+    target_compile_definitions("${EXEC_NAME}" PUBLIC "_${TARGET_ARCH}_")
 
     if (ARCHIVE_LIB STREQUAL "miniz")
         target_compile_definitions("${EXEC_NAME}" PRIVATE USE_MINIZ=1)

acquire/tests/test.c

@@ -1,5 +1,7 @@
 #include <greatest.h>
 
+#include "acquire_common_defs.h"
+
 #include "test_checksum.h"
 #include "test_download.h"
 #include "test_fileutils.h"

cmake/libacquire_amalgamation.cmake

@@ -98,6 +98,7 @@ function(create_amalgamation_target amalgamation_header)
         get_filename_component(dir_of_amalgamation_header "${amalgamation_header}" DIRECTORY)
 
         add_library("${LIBRARY_NAME}" INTERFACE)
+        target_compile_definitions("${LIBRARY_NAME}" PUBLIC "_${TARGET_ARCH}_")
         include(GNUInstallDirs)
         target_include_directories(
                 "${LIBRARY_NAME}"