|
27 | 27 | run: | |
28 | 28 | cp ${{github.workspace}}/zlib/build/zconf.h ${{github.workspace}}/zlib/ |
29 | 29 | cd ${{github.workspace}}/zlib/contrib/minizip && autoreconf -fvi |
30 | | - cd ${{github.workspace}}/zlib/contrib/minizip && CFLAGS="-m32 -march=x86-64" ./configure --host=i686-w64-mingw32 |
| 30 | + cd ${{github.workspace}}/zlib/contrib/minizip && CFLAGS="-m32 -march=i686" ./configure --host=i686-w64-mingw32 |
31 | 31 | - name: Build minizip |
32 | 32 | run: | |
33 | 33 | make -C ${{github.workspace}}/zlib/contrib/minizip |
@@ -186,7 +186,7 @@ jobs: |
186 | 186 | - name: Build |
187 | 187 | run: | |
188 | 188 | mkdir -p ${{github.workspace}}/astronomy/build |
189 | | - i686-w64-mingw32-gcc -m32 -march=x86-64 -c \ |
| 189 | + i686-w64-mingw32-gcc -m32 -march=i686 -c \ |
190 | 190 | -I ${{github.workspace}}/astronomy/source/c \ |
191 | 191 | -o ${{github.workspace}}/astronomy/build/astronomy.o \ |
192 | 192 | ${{github.workspace}}/astronomy/source/c/astronomy.c |
@@ -222,7 +222,7 @@ jobs: |
222 | 222 | path: tomlc99 |
223 | 223 | - name: Build |
224 | 224 | run: | |
225 | | - CC=i686-w64-mingw32-gcc CFLAGS="-m32 -march=x86-64" make -C ${{github.workspace}}/tomlc99 libtoml.a |
| 225 | + CC=i686-w64-mingw32-gcc CFLAGS="-m32 -march=i686" make -C ${{github.workspace}}/tomlc99 libtoml.a |
226 | 226 | - name: Package files |
227 | 227 | run: | |
228 | 228 | mkdir -p ${{github.workspace}}/tomlc99/build/include/ |
@@ -263,7 +263,6 @@ jobs: |
263 | 263 | --disable-static \ |
264 | 264 | --disable-avdevice \ |
265 | 265 | --disable-swscale \ |
266 | | - --disable-postproc \ |
267 | 266 | --disable-avfilter \ |
268 | 267 | --disable-network \ |
269 | 268 | --disable-dwt \ |
@@ -367,7 +366,7 @@ jobs: |
367 | 366 | path: | |
368 | 367 | ${{github.workspace}}/openal/build/libOpenAL32.a |
369 | 368 | ${{github.workspace}}/openal/build/include |
370 | | - |
| 369 | +
|
371 | 370 | luajit-mingw32: |
372 | 371 | runs-on: ubuntu-24.04 |
373 | 372 | steps: |
@@ -428,14 +427,22 @@ jobs: |
428 | 427 | run: | |
429 | 428 | cp ${{github.workspace}}/zlib/build/zconf.h ${{github.workspace}}/zlib/ |
430 | 429 | cd ${{github.workspace}}/zlib/contrib/minizip && autoreconf -fvi |
431 | | - cd ${{github.workspace}}/zlib/contrib/minizip && ./configure |
| 430 | + cd ${{github.workspace}}/zlib/contrib/minizip && CFLAGS="-m64 -march=x86-64" ./configure --host=x86_64-w64-mingw32 |
432 | 431 | - name: Build minizip |
433 | 432 | run: | |
434 | 433 | make -C ${{github.workspace}}/zlib/contrib/minizip |
435 | 434 | - name: Package files |
436 | 435 | run: | |
437 | 436 | mkdir -p ${{github.workspace}}/zlib/build/include/minizip |
438 | | - cp ${{github.workspace}}/zlib/contrib/minizip/.libs/libminizip.a ${{github.workspace}}/zlib/build/ |
| 437 | + cp ${{github.workspace}}/zlib/contrib/minizip/ioapi.o ${{github.workspace}}/zlib/contrib/minizip/ioapi.lib |
| 438 | + cp ${{github.workspace}}/zlib/contrib/minizip/mztools.o ${{github.workspace}}/zlib/contrib/minizip/mztools.lib |
| 439 | + cp ${{github.workspace}}/zlib/contrib/minizip/unzip.o ${{github.workspace}}/zlib/contrib/minizip/unzip.lib |
| 440 | + cp ${{github.workspace}}/zlib/contrib/minizip/zip.o ${{github.workspace}}/zlib/contrib/minizip/zip.lib |
| 441 | + ar cr ${{github.workspace}}/zlib/build/libminizip.a \ |
| 442 | + ${{github.workspace}}/zlib/contrib/minizip/ioapi.lib \ |
| 443 | + ${{github.workspace}}/zlib/contrib/minizip/mztools.lib \ |
| 444 | + ${{github.workspace}}/zlib/contrib/minizip/unzip.lib \ |
| 445 | + ${{github.workspace}}/zlib/contrib/minizip/zip.lib |
439 | 446 | cp ${{github.workspace}}/zlib/*.h ${{github.workspace}}/zlib/build/include/ |
440 | 447 | cp ${{github.workspace}}/zlib/contrib/minizip/*.h ${{github.workspace}}/zlib/build/include/minizip/ |
441 | 448 | cp ${{github.workspace}}/zlib/build/zconf.h ${{github.workspace}}/zlib/build/include/ |
@@ -663,7 +670,6 @@ jobs: |
663 | 670 | --disable-static \ |
664 | 671 | --disable-avdevice \ |
665 | 672 | --disable-swscale \ |
666 | | - --disable-postproc \ |
667 | 673 | --disable-avfilter \ |
668 | 674 | --disable-network \ |
669 | 675 | --disable-dwt \ |
|
0 commit comments