Merge branch 'feature/natives' into ci/feature/natives/sdl2_bins

dotnet · Apr 13, 2024 · 9b6d471 · 9b6d471
2 parents b07aa71 + b0bde43
commit 9b6d471
Show file tree

Hide file tree

Showing 20 changed files with 19 additions and 16 deletions.
diff --git a/.github/workflows/sdl2.yml b/.github/workflows/sdl2.yml
@@ -76,8 +76,9 @@ jobs:
             apt update
             apt install -y gcc gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-i686-linux-gnu
             apt install -y g++ g++-aarch64-linux-gnu g++-arm-linux-gnueabihf gcc-i686-linux-gnu
-            apt install -y automake build-essential curl git libtool pkg-config python3 wget
+            apt install -y automake build-essential curl git libtool python3 wget
             for arch in amd64 arm64 armhf i386; do
+              apt install -y pkgconf:$arch
               apt install -y libasound2-dev:$arch libpulse-dev:$arch libaudio-dev:$arch libjack-dev:$arch
               apt install -y libsndio-dev:$arch libsamplerate0-dev:$arch libx11-dev:$arch libxext-dev:$arch
               apt install -y libxrandr-dev:$arch libxcursor-dev:$arch libxfixes-dev:$arch libxi-dev:$arch
@@ -99,6 +100,7 @@ jobs:
 
             # mark workspace as safe
             git config --global --add safe.directory /github/workspace
+            git config --global --add safe.directory /github/workspace/build/submodules/SDL
 
             ${{ matrix.env.nuke_invoke }} SDL2
         env:

diff --git a/.github/workflows/vulkan-loader.yml b/.github/workflows/vulkan-loader.yml
@@ -40,7 +40,7 @@ jobs:
               sudo apt update
               sudo apt install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf
               for arch in amd64 arm64 armhf; do
-                sudo apt install -y pkg-config:$arch
+                sudo apt install -y pkgconf:$arch
                 sudo apt install -y libx11-xcb-dev:$arch libxkbcommon-dev:$arch libwayland-dev:$arch libxrandr-dev:$arch
               done
           - os: windows-2022

diff --git a/.github/workflows/wgpu.yml b/.github/workflows/wgpu.yml
@@ -40,6 +40,7 @@ jobs:
               sudo dpkg --add-architecture i386
               sudo apt update
               sudo apt install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-i686-linux-gnu
+              sudo apt install -y libgcc-11-dev libgcc-11-dev-arm64-cross libgcc-11-dev-armhf-cross libgcc-11-dev-i386-cross
           - os: windows-2022
             name: Windows
             nuke_invoke: ./build.cmd

diff --git a/build/cmake/aarch64-linux-gnu.cmake b/build/cmake/aarch64-linux-gnu.cmake
@@ -3,7 +3,7 @@ set(CMAKE_SYSTEM_PROCESSOR aarch64)
 set(CMAKE_C_COMPILER "/usr/bin/aarch64-linux-gnu-gcc")
 set(CMAKE_CXX_COMPILER "/usr/bin/aarch64-linux-gnu-g++")
 set(CMAKE_LINKER "/usr/bin/aarch64-linux-gnu-ld")
-set(PKG_CONFIG_EXECUTABLE "/usr/bin/aarch64-linux-gnu-pkg-config")
+>set(PKG_CONFIG_EXECUTABLE "/usr/bin/aarch64-linux-gnu-pkgconf")
 set(CMAKE_FIND_ROOT_PATH "/usr/aarch64-linux-gnu")
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)

diff --git a/build/cmake/arm-linux-gnueabihf.cmake b/build/cmake/arm-linux-gnueabihf.cmake
@@ -3,7 +3,7 @@ set(CMAKE_SYSTEM_PROCESSOR armv7l)
 set(CMAKE_C_COMPILER "/usr/bin/arm-linux-gnueabihf-gcc")
 set(CMAKE_CXX_COMPILER "/usr/bin/arm-linux-gnueabihf-g++")
 set(CMAKE_LINKER "/usr/bin/arm-linux-gnueabihf-ld")
-set(PKG_CONFIG_EXECUTABLE "/usr/bin/arm-linux-gnueabihf-pkg-config")
+set(PKG_CONFIG_EXECUTABLE "/usr/bin/arm-linux-gnueabihf-pkgconf")
 set(CMAKE_FIND_ROOT_PATH "/usr/arm-linux-gnueabihf")
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)

diff --git a/build/cmake/i686-linux-gnu.cmake b/build/cmake/i686-linux-gnu.cmake
@@ -3,7 +3,7 @@ set(CMAKE_SYSTEM_PROCESSOR i686)
 set(CMAKE_C_COMPILER "/usr/bin/i686-linux-gnu-gcc")
 set(CMAKE_CXX_COMPILER "/usr/bin/i686-linux-gnu-g++")
 set(CMAKE_LINKER "/usr/bin/i686-linux-gnu-ld")
-set(PKG_CONFIG_EXECUTABLE "/usr/bin/i686-linux-gnu-pkg-config")
+set(PKG_CONFIG_EXECUTABLE "/usr/bin/i686-linux-gnu-pkgconf")
 set(CMAKE_FIND_ROOT_PATH "/usr/i686-linux-gnu")
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)

diff --git a/build/cmake/x86_64-linux-gnu.cmake b/build/cmake/x86_64-linux-gnu.cmake
@@ -3,7 +3,7 @@ set(CMAKE_SYSTEM_PROCESSOR x86_64)
 set(CMAKE_C_COMPILER "/usr/bin/x86_64-linux-gnu-gcc")
 set(CMAKE_CXX_COMPILER "/usr/bin/x86_64-linux-gnu-g++")
 set(CMAKE_LINKER "/usr/bin/x86_64-linux-gnu-ld")
-set(PKG_CONFIG_EXECUTABLE "/usr/bin/x86_64-linux-gnu-pkg-config")
+set(PKG_CONFIG_EXECUTABLE "/usr/bin/x86_64-linux-gnu-pkgconf")
 set(CMAKE_FIND_ROOT_PATH "/usr/x86_64-linux-gnu")
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)

diff --git a/build/nuke/Native/Assimp.cs b/build/nuke/Native/Assimp.cs
@@ -73,7 +73,7 @@ partial class Build {
                             InheritedShell($"{prepare} {GetCMakeToolchainFlag(triple)}", buildDir).AssertZeroExitCode();
                             InheritedShell(build, buildDir).AssertZeroExitCode();
 
-                            InheritedShell($"{triple}-strip bin/libassimp.so.5", buildDir).AssertZeroExitCode();
+                            InheritedShell($"{triple}-strip --strip-unneeded bin/libassimp.so.5", buildDir).AssertZeroExitCode();
 
                             CopyAll((buildDir / "bin").GlobFiles("libassimp.so.5"), runtimes / rid / "native");
                         }
@@ -91,7 +91,7 @@ partial class Build {
                             InheritedShell($"{prepare} -DCMAKE_OSX_ARCHITECTURES={arch}", buildDir).AssertZeroExitCode();
                             InheritedShell(build, buildDir).AssertZeroExitCode();
 
-                            InheritedShell($"strip bin/libassimp.5.dylib", buildDir).AssertZeroExitCode();
+                            InheritedShell($"strip -Sx bin/libassimp.5.dylib", buildDir).AssertZeroExitCode();
 
                             CopyAll((buildDir / "bin").GlobFiles("libassimp.5.dylib"), runtimes / rid / "native");
                         }

diff --git a/build/nuke/Native/GLFW.cs b/build/nuke/Native/GLFW.cs
@@ -73,7 +73,7 @@ partial class Build {
                             InheritedShell($"{prepare} {GetCMakeToolchainFlag(triple)}", buildDir).AssertZeroExitCode();
                             InheritedShell(build, buildDir).AssertZeroExitCode();
 
-                            InheritedShell($"{triple}-strip src/libglfw.so", buildDir).AssertZeroExitCode();
+                            InheritedShell($"{triple}-strip --strip-unneeded src/libglfw.so", buildDir).AssertZeroExitCode();
 
                             CopyAll((buildDir / "src").GlobFiles("libglfw.so"), runtimes / rid / "native");
                         }
@@ -91,7 +91,7 @@ partial class Build {
                             InheritedShell($"{prepare} -DCMAKE_OSX_ARCHITECTURES={arch}", buildDir).AssertZeroExitCode();
                             InheritedShell(build, buildDir).AssertZeroExitCode();
 
-                            InheritedShell($"strip src/libglfw.3.dylib", buildDir).AssertZeroExitCode();
+                            InheritedShell($"strip -Sx src/libglfw.3.dylib", buildDir).AssertZeroExitCode();
 
                             CopyAll((buildDir / "src").GlobFiles("libglfw.3.dylib"), runtimes / rid / "native");
                         }

diff --git a/build/nuke/Native/SDL2.cs b/build/nuke/Native/SDL2.cs
@@ -95,7 +95,7 @@ static readonly (string Sdk, string Arch, string Rid, string Args)[] iPhoneConfi
                     InheritedShell($"make {JobsArg}", SDL2Path).AssertZeroExitCode();
                     InheritedShell($"make install", SDL2Path).AssertZeroExitCode();
 
-                    InheritedShell($"{triple}-strip lib/libSDL2-2.0.so*", buildDir).AssertZeroExitCode();
+                    InheritedShell($"{triple}-strip --strip-unneeded lib/libSDL2-2.0.so*", buildDir).AssertZeroExitCode();
 
                     CopyFile((buildDir / "lib").GlobFiles("libSDL2-2.0.so*").First(), runtimes / rid / "native" / "libSDL2-2.0.so", FileExistsPolicy.Overwrite);
                 }
@@ -128,7 +128,7 @@ static readonly (string Sdk, string Arch, string Rid, string Args)[] iPhoneConfi
 
                     EnsureCleanDirectory(Path.GetDirectoryName(@out));
                     InheritedShell($"lipo -create -output \"{@out}\" \"{@in}\"").AssertZeroExitCode();
-                    InheritedShell($"strip \"{@out}\"").AssertZeroExitCode();
+                    InheritedShell($"strip -Sx \"{@out}\"").AssertZeroExitCode();
                 }
             }
 

diff --git a/build/nuke/Native/SwiftShader.cs b/build/nuke/Native/SwiftShader.cs
@@ -80,7 +80,7 @@ partial class Build {
                             InheritedShell($"{prepare} {GetCMakeToolchainFlag(triple)}", buildDir).AssertZeroExitCode();
                             InheritedShell(build, buildDir).AssertZeroExitCode();
 
-                            InheritedShell($"{triple}-strip Linux/libvk_swiftshader.so", buildDir).AssertZeroExitCode();
+                            InheritedShell($"{triple}-strip --strip-unneeded Linux/libvk_swiftshader.so", buildDir).AssertZeroExitCode();
 
                             CopyFile(buildDir / "Linux" / "libvk_swiftshader.so", runtimes / rid / "native" / "libvk_swiftshader.so", FileExistsPolicy.Overwrite);
                             CopyFile(buildDir / "Linux" / "vk_swiftshader_icd.json", runtimes / rid / "native" / "vk_swiftshader_icd.json", FileExistsPolicy.Overwrite);
@@ -99,7 +99,7 @@ partial class Build {
                             InheritedShell($"{prepare} -DCMAKE_OSX_ARCHITECTURES={arch}", buildDir).AssertZeroExitCode();
                             InheritedShell(build, buildDir).AssertZeroExitCode();
 
-                            InheritedShell($"-strip Darwin/libvk_swiftshader.dylib", buildDir).AssertZeroExitCode();
+                            InheritedShell($"strip -Sx Darwin/libvk_swiftshader.dylib", buildDir).AssertZeroExitCode();
 
                             CopyFile(buildDir / "Darwin" / "libvk_swiftshader.dylib", runtimes / rid / "native" / "libvk_swiftshader.dylib", FileExistsPolicy.Overwrite);
                             CopyFile(buildDir / "Darwin" / "vk_swiftshader_icd.json", runtimes / rid / "native" / "vk_swiftshader_icd.json", FileExistsPolicy.Overwrite);

diff --git a/build/nuke/Native/VulkanLoader.cs b/build/nuke/Native/VulkanLoader.cs
@@ -72,7 +72,7 @@ partial class Build {
                             InheritedShell($"{prepare} {GetCMakeToolchainFlag(triple)}", buildDir).AssertZeroExitCode();
                             InheritedShell(build, buildDir).AssertZeroExitCode();
 
-                            InheritedShell($"{triple}-strip loader/libvulkan.so", buildDir).AssertZeroExitCode();
+                            InheritedShell($"{triple}-strip --strip-unneeded loader/libvulkan.so", buildDir).AssertZeroExitCode();
 
                             CopyAll((buildDir / "loader").GlobFiles("libvulkan.so"), runtimes / rid / "native");
                         }
@@ -90,7 +90,7 @@ partial class Build {
                             InheritedShell($"{prepare} -DCMAKE_OSX_ARCHITECTURES={arch}", buildDir).AssertZeroExitCode();
                             InheritedShell(build, buildDir).AssertZeroExitCode();
 
-                            InheritedShell($"strip loader/libvulkan.dylib", buildDir).AssertZeroExitCode();
+                            InheritedShell($"strip -Sx loader/libvulkan.dylib", buildDir).AssertZeroExitCode();
 
                             CopyAll((buildDir / "loader").GlobFiles("libvulkan.dylib"), runtimes / rid / "native");
                         }

diff --git a/src/Native/Silk.NET.SDL.Native/runtimes/ios/native/libSDL2.a b/src/Native/Silk.NET.SDL.Native/runtimes/ios/native/libSDL2.a
diff --git a/src/Native/Silk.NET.SDL.Native/runtimes/iossimulator/native/libSDL2.a b/src/Native/Silk.NET.SDL.Native/runtimes/iossimulator/native/libSDL2.a
diff --git a/src/Native/Silk.NET.SDL.Native/runtimes/osx/native/libSDL2-2.0.dylib b/src/Native/Silk.NET.SDL.Native/runtimes/osx/native/libSDL2-2.0.dylib
diff --git a/src/Native/Silk.NET.SDL.Native/runtimes/tvos/native/libSDL2.a b/src/Native/Silk.NET.SDL.Native/runtimes/tvos/native/libSDL2.a
diff --git a/src/Native/Silk.NET.SDL.Native/runtimes/tvossimulator/native/libSDL2.a b/src/Native/Silk.NET.SDL.Native/runtimes/tvossimulator/native/libSDL2.a
diff --git a/src/Native/Silk.NET.SDL.Native/runtimes/win-arm64/native/SDL2.dll b/src/Native/Silk.NET.SDL.Native/runtimes/win-arm64/native/SDL2.dll
diff --git a/src/Native/Silk.NET.SDL.Native/runtimes/win-x64/native/SDL2.dll b/src/Native/Silk.NET.SDL.Native/runtimes/win-x64/native/SDL2.dll
diff --git a/src/Native/Silk.NET.SDL.Native/runtimes/win-x86/native/SDL2.dll b/src/Native/Silk.NET.SDL.Native/runtimes/win-x86/native/SDL2.dll