libretro: attempted build fixes post merge

.gitlab-ci.yml

@@ -62,7 +62,7 @@ libretro-build-windows-x64:
     - .libretro-windows-cmake-x86_64
   variables:
     EXTRA_PATH: bin/Release
-    CORE_ARGS: ${BASE_CORE_ARGS} -DENABLE_LTO=OFF
+    CORE_ARGS: ${BASE_CORE_ARGS} -DENABLE_LTO=OFF -G Ninja
   before_script:
     - export NUMPROC=$(($(nproc)/5))
     - sudo apt-get update -qy

CMakeLists.txt

@@ -21,9 +21,10 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")
 include(DownloadExternals)
 include(CMakeDependentOption)
-include(FindPkgConfig)
 
 project(citra LANGUAGES C CXX ASM)
+# must be invoked after project() command when using CMAKE_TOOLCHAIN_FILE
+include(FindPkgConfig)
 if (CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS")
     enable_language(OBJC OBJCXX)
 endif()

externals/CMakeLists.txt

@@ -230,7 +230,7 @@ else()
     )
     target_link_libraries(zstd_seekable PUBLIC libzstd_static)
 
-    target_link_libraries(libzstd_static INTERFACE zstd_seekable)
+    target_link_libraries(libzstd_static zstd_seekable)
 
     add_library(zstd ALIAS libzstd_static)
 

src/common/zstd_compression.cpp

@@ -9,7 +9,6 @@
 #include <algorithm>
 #include <chrono>
 #include <ctime>
-#include <format>
 #include <mutex>
 #include <sstream>
 #include <zstd.h>