From 5c2ae192a1c40004d733066206f1ae401680248d Mon Sep 17 00:00:00 2001 From: theofficialgman <28281419+theofficialgman@users.noreply.github.com> Date: Fri, 27 Oct 2023 16:22:27 -0400 Subject: [PATCH] use cross compiler for i386 --- .github/workflows/pushaction.yml | 6 +++--- .github/workflows/releaseaction.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pushaction.yml b/.github/workflows/pushaction.yml index 33b63a4..e37dd9d 100644 --- a/.github/workflows/pushaction.yml +++ b/.github/workflows/pushaction.yml @@ -79,7 +79,7 @@ jobs: xz-utils \ openjdk-11-jdk-headless \ maven \ - build-essential \ + build-essential libc6-dev-amd64-cross \ ant sudo locales # set Locale to en_US.UTF-8 (avoids hang during compilation) locale-gen en_US.UTF-8 @@ -113,7 +113,7 @@ jobs: - name: Install Windows compilers run: sudo apt-get -yq install g++-mingw-w64-i686 g++-mingw-w64-x86-64 - name: Install Linux x86 compilers/libraries - run: sudo apt-get -yq install gcc-multilib g++-multilib linux-libc-dev:i386 + run: sudo apt-get -yq install gcc-multilib-i686-linux-gnu g++-multilib-i686-linux-gnu gcc-multilib-x86-64-linux-gnux32 g++-multilib-x86-64-linux-gnux32 binutils-i686-gnu libc6-dev-i386-cross libc6-dev-x32-cross libc6-dev-i386-amd64-cross libc6-dev-i386-x32-cross libstdc++-7-dev-amd64-cross lib32stdc++-7-dev - name: Install Linux arm32 compilers/libraries run: sudo apt-get -yq install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf binutils-arm-linux-gnueabihf - name: Install Linux arm64 compilers/libraries @@ -135,7 +135,7 @@ jobs: working-directory: SDL/build-linux64 - run: mkdir -p SDL/build-linux32 - - run: ../configure CFLAGS="-fPIC -m32" CPPFLAGS="-fPIC -m32" LDFLAGS="-m32" --disable-audio --disable-video --disable-video-vulkan --disable-render --disable-filesystem --disable-threads --disable-directx --disable-mmx --disable-3dnow --disable-sse --disable-sse2 --disable-sse3 --disable-cpuinfo --disable-sensor --enable-hidapi + - run: ../configure --host=i686-linux-gnu CFLAGS="-fPIC" CPPFLAGS="-fPIC" --disable-audio --disable-video --disable-video-vulkan --disable-render --disable-filesystem --disable-threads --disable-directx --disable-mmx --disable-3dnow --disable-sse --disable-sse2 --disable-sse3 --disable-cpuinfo --disable-sensor --enable-hidapi working-directory: SDL/build-linux32 - run: make -j working-directory: SDL/build-linux32 diff --git a/.github/workflows/releaseaction.yml b/.github/workflows/releaseaction.yml index 577feb8..ff2525a 100644 --- a/.github/workflows/releaseaction.yml +++ b/.github/workflows/releaseaction.yml @@ -81,7 +81,7 @@ jobs: xz-utils \ openjdk-11-jdk-headless \ maven \ - build-essential \ + build-essential libc6-dev-amd64-cross \ ant sudo locales # set Locale to en_US.UTF-8 (avoids hang during compilation) locale-gen en_US.UTF-8 @@ -115,7 +115,7 @@ jobs: - name: Install Windows compilers run: sudo apt-get -yq install g++-mingw-w64-i686 g++-mingw-w64-x86-64 - name: Install Linux x86 compilers/libraries - run: sudo apt-get -yq install gcc-multilib g++-multilib linux-libc-dev:i386 + run: sudo apt-get -yq install gcc-multilib-i686-linux-gnu g++-multilib-i686-linux-gnu gcc-multilib-x86-64-linux-gnux32 g++-multilib-x86-64-linux-gnux32 binutils-i686-gnu libc6-dev-i386-cross libc6-dev-x32-cross libc6-dev-i386-amd64-cross libc6-dev-i386-x32-cross libstdc++-7-dev-amd64-cross lib32stdc++-7-dev - name: Install Linux arm32 compilers/libraries run: sudo apt-get -yq install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf binutils-arm-linux-gnueabihf - name: Install Linux arm64 compilers/libraries @@ -137,7 +137,7 @@ jobs: working-directory: SDL/build-linux64 - run: mkdir -p SDL/build-linux32 - - run: ../configure CFLAGS="-fPIC -m32" CPPFLAGS="-fPIC -m32" LDFLAGS="-m32" --disable-audio --disable-video --disable-video-vulkan --disable-render --disable-filesystem --disable-threads --disable-directx --disable-mmx --disable-3dnow --disable-sse --disable-sse2 --disable-sse3 --disable-cpuinfo --disable-sensor --enable-hidapi + - run: ../configure --host=i686-linux-gnu CFLAGS="-fPIC" CPPFLAGS="-fPIC" --disable-audio --disable-video --disable-video-vulkan --disable-render --disable-filesystem --disable-threads --disable-directx --disable-mmx --disable-3dnow --disable-sse --disable-sse2 --disable-sse3 --disable-cpuinfo --disable-sensor --enable-hidapi working-directory: SDL/build-linux32 - run: make -j working-directory: SDL/build-linux32