Skip to content

Commit 99239c9

Browse files
authored
Fixed 64-bit Windows build of minizip(#4)
And some other minor things
1 parent 000cbab commit 99239c9

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

.github/workflows/build.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
run: |
2828
cp ${{github.workspace}}/zlib/build/zconf.h ${{github.workspace}}/zlib/
2929
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
3131
- name: Build minizip
3232
run: |
3333
make -C ${{github.workspace}}/zlib/contrib/minizip
@@ -186,7 +186,7 @@ jobs:
186186
- name: Build
187187
run: |
188188
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 \
190190
-I ${{github.workspace}}/astronomy/source/c \
191191
-o ${{github.workspace}}/astronomy/build/astronomy.o \
192192
${{github.workspace}}/astronomy/source/c/astronomy.c
@@ -222,7 +222,7 @@ jobs:
222222
path: tomlc99
223223
- name: Build
224224
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
226226
- name: Package files
227227
run: |
228228
mkdir -p ${{github.workspace}}/tomlc99/build/include/
@@ -263,7 +263,6 @@ jobs:
263263
--disable-static \
264264
--disable-avdevice \
265265
--disable-swscale \
266-
--disable-postproc \
267266
--disable-avfilter \
268267
--disable-network \
269268
--disable-dwt \
@@ -367,7 +366,7 @@ jobs:
367366
path: |
368367
${{github.workspace}}/openal/build/libOpenAL32.a
369368
${{github.workspace}}/openal/build/include
370-
369+
371370
luajit-mingw32:
372371
runs-on: ubuntu-24.04
373372
steps:
@@ -428,14 +427,22 @@ jobs:
428427
run: |
429428
cp ${{github.workspace}}/zlib/build/zconf.h ${{github.workspace}}/zlib/
430429
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
432431
- name: Build minizip
433432
run: |
434433
make -C ${{github.workspace}}/zlib/contrib/minizip
435434
- name: Package files
436435
run: |
437436
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
439446
cp ${{github.workspace}}/zlib/*.h ${{github.workspace}}/zlib/build/include/
440447
cp ${{github.workspace}}/zlib/contrib/minizip/*.h ${{github.workspace}}/zlib/build/include/minizip/
441448
cp ${{github.workspace}}/zlib/build/zconf.h ${{github.workspace}}/zlib/build/include/
@@ -663,7 +670,6 @@ jobs:
663670
--disable-static \
664671
--disable-avdevice \
665672
--disable-swscale \
666-
--disable-postproc \
667673
--disable-avfilter \
668674
--disable-network \
669675
--disable-dwt \

0 commit comments

Comments
 (0)