Fix compile on linux

Author: kotcrab

CMakeLists.txt

@@ -11,7 +11,7 @@ set_source_files_properties(
   COMPILE_FLAGS "-w"
 )
 
-file(GLOB XXHASH_SRC vendor/xxHash/*.c)
+file(GLOB XXHASH_SRC vendor/xxHash/xxhash.c)
 set_source_files_properties(
   ${XXHASH_SRC}
   PROPERTIES
@@ -25,10 +25,15 @@ add_executable(fine ${XDELTA_SRC} ${XXHASH_SRC} ${FINE_SRC})
 add_compile_definitions(SIZEOF_SIZE_T=8 PICOJSON_USE_INT64)
 add_subdirectory(vendor/spdlog)
 target_compile_options(fine PRIVATE -Wall -Wextra -Wstrict-aliasing=0 -fno-rtti -O3)
-target_link_libraries(fine -municode -static spdlog::spdlog -s)
+if (WIN32)
+  set(OS_LINK_FLAGS "-municode")
+else()
+  set(OS_LINK_FLAGS)
+endif()
+target_link_libraries(fine ${OS_LINK_FLAGS} -static spdlog::spdlog -s)
 set_target_properties(fine
-    PROPERTIES
-    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/target"
-    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/target"
-    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/target"
+  PROPERTIES
+  ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/target"
+  LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/target"
+  RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/target"
 )

src/main.cpp

@@ -111,7 +111,7 @@ int wmain(int argc, const wchar_t* argv[]) {
 static void setupWorkingDirectory(const char* arg0) {
     spdlog::info("Init: setup working directory");
     auto dir = fs::weakly_canonical(fs::path(arg0)).parent_path();
-    spdlog::info("Init: changing working directory to {}", dir);
+    spdlog::info("Init: changing working directory to {}", dir.u8string());
     chdir(dir.c_str());
 }
 

src/platform.h

@@ -2,10 +2,13 @@
 
 #ifdef _WIN32
 #include <Windows.h>
+#else
+#include <unistd.h>
 #endif
 
 #include <algorithm>
 #include <cstdint>
+#include <cstring>
 #include <filesystem>
 #include <fstream>
 #include <iostream>

src/streamio.cpp

@@ -87,14 +87,14 @@ void BufferStreamIO::writeFully(const u8* buf, i64 len) {
     if (position + len > dataLen) {
         bail("Buffer overflow in BufferStreamIO.writeFully");
     }
-    memcpy(data + position, buf, len);
+    std::memcpy(data + position, buf, len);
     position += len;
 }
 
 void BufferStreamIO::readFully(u8* buf, i64 len) {
     if (position + len > dataLen) {
         bail("Buffer EOF in BufferStreamIO.readFully");
     }
-    memcpy(buf, data + position, len);
+    std::memcpy(buf, data + position, len);
     position += len;
 }