Merge pull request #469 from cscd98/build-fxies

libretro: build fixes for iOS/tvOS and windows

Author: cscd98

.gitlab-ci.yml

@@ -60,7 +60,7 @@ libretro-build-windows-x64:
     - .core-defs
   image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-mxe-win-cross-cores:gcc14
   variables:
-    EXTRA_PATH: ../../Binary/x64
+    EXTRA_PATH: Binaries
   before_script:
     - export NUMPROC=$(($(nproc)/5))
     - if builtin type -P ccache &> /dev/null; then ccache -V &> /dev/null; fi

CMakeLists.txt

@@ -11,8 +11,9 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0.0" CACHE STRING "")
 
 # When we don't set a sysroot, AppleClang will put /usr/local/include at a higher
 # priority than -isystem paths, which can cause weird include issues in Externals
-set(CMAKE_OSX_SYSROOT macosx CACHE STRING "")
-
+if(NOT IOS AND NOT TVOS)
+  set(CMAKE_OSX_SYSROOT macosx CACHE STRING "")
+endif( )
 set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_CURRENT_SOURCE_DIR}/CMake/FlagsOverride.cmake")
 
 # CMake 3.28 and later scan c++ source files for module imports by default. Since we don't use