diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 6007617..0838cfc 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -20,7 +20,7 @@ jobs: gcc-12-arm-linux-gnueabihf \ gcc-12-mips-linux-gnu \ gcc-12-riscv64-linux-gnu \ - gcc-12-mingw-w64-x86-64 + mingw-w64 - name: Build object files run: bash src/copapy/obj/crosscompile.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 598961a..2744a93 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,8 +15,7 @@ jobs: - name: Install cross compilers run: | sudo apt-get update - sudo apt-get install -y \ - gcc-12-mingw-w64-x86-64 + sudo apt-get install -y mingw-w64 - name: Build ops obj files run: | diff --git a/src/copapy/obj/crosscompile.sh b/src/copapy/obj/crosscompile.sh index 4caa6e2..673192e 100644 --- a/src/copapy/obj/crosscompile.sh +++ b/src/copapy/obj/crosscompile.sh @@ -18,11 +18,13 @@ DEST=src/copapy/obj OPT=O3 mkdir -p $DEST +x86_64-w64-mingw32-gcc --version + # Native x86_64 gcc-12 -$OPT -c $SRC -o $DEST/stencils_x86_64_$OPT.o # Windows x86_64 (ARM64) -x86_64-w64-mingw32-gcc -$OPT -c $SRC -o $DEST/stencils_AMD64_$OPT.o +mingw-w64 -$OPT -c $SRC -o $DEST/stencils_AMD64_$OPT.o # ARM64 aarch64-linux-gnu-gcc-12 -$OPT -c $SRC -o $DEST/stencils_aarch64_$OPT.o diff --git a/src/copapy/obj/nativecompile.sh b/src/copapy/obj/nativecompile.sh index b7cb568..3f88cdd 100644 --- a/src/copapy/obj/nativecompile.sh +++ b/src/copapy/obj/nativecompile.sh @@ -13,5 +13,7 @@ gcc-12 -c $SRC -O1 -o $DEST/stencils_x86_64_O1.o gcc-12 -c $SRC -O2 -o $DEST/stencils_x86_64_O2.o gcc-12 -c $SRC -O3 -o $DEST/stencils_x86_64_O3.o +x86_64-w64-mingw32-gcc --version + # Windows x86_64 (ARM64) x86_64-w64-mingw32-gcc -O3 -c $SRC -o $DEST/stencils_AMD64_$OPT.o \ No newline at end of file