Skip to content

Commit 1a3c932

Browse files
committed
mingw: Use Makefile.unix to build opusfile.
This is faster. We still don't have good dependency tracking among the components, but roughly: make make opusfile-0.dll make package Should automate the basics of putting together a win32 binary package. It still doesn't include documentation. See the mingw/README for additional steps there. Also, don't copy dll.a files. They don't seem to be necessary.
1 parent a0c9136 commit 1a3c932

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

mingw/Makefile

+5-7
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,12 @@ $(DIST): $(addprefix $(CURDIR)/bin/, libogg-0.dll libopus-0.dll)
9999
#cd .. && make install
100100
mkdir -p $(DIST)
101101
cp ../AUTHORS ../COPYING ../README.md ../include/opusfile.h $@
102-
cp ../.libs/libopusfile-0.dll $@
103-
cp ../.libs/libopusfile.a $@
104-
cp ../.libs/libopusfile.dll.a $@
105-
cp ../.libs/libopusurl-0.dll $@
106-
cp ../.libs/libopusurl.a $@
107-
cp ../.libs/libopusurl.dll.a $@
102+
cp .libs/libopusfile-0.dll $@
103+
cp .libs/libopusfile.a $@
104+
cp .libs/libopusurl-0.dll $@
105+
cp .libs/libopusurl.a $@
108106
cp bin/*.dll $@
109-
cp ../examples/.libs/*.exe $@
107+
cp *.exe $@
110108
cp /usr/i686-w64-mingw32/sys-root/mingw/bin/libgcc_s_dw2-1.dll $@
111109
cp /usr/i686-w64-mingw32/sys-root/mingw/bin/libwinpthread-1.dll $@
112110
i686-w64-mingw32-strip $@/*.exe

mingw/README.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Cross-compiling under mingw
22

3-
Just running `make` in this directory should download
3+
Just running `make libopusfile-0.dll` in this directory should download
44
and build opusfile and its dependencies. Some mingw
55
libraries need to be compiled into the final package.
66

@@ -44,12 +44,13 @@ The steps are something like
4444
- Convert README.md to DOS line endings.
4545
- Copy .libs/libopusfile-0.dll to the release dir.
4646
- Copy .libs/libopusfile.a to the release dir.
47-
- Copy .libs/libopusfile.dll.a to the release dir. (May not be needed?)
4847
- Copy .libs/libopusurl-0.dll to the release dir.
4948
- Copy .libs/libopusurl.a to the release dir.
50-
- Copy .libs/libopusurl.dll.a to the release dir. (May not be needed?)
5149
- Copy mingw/bin/*.dll to the release dir for dependencies.
52-
- Copy any other dependent dlls, e.g. on Fedora 23 I needed to copy
50+
- Copy any other dependent dlls, e.g. on Fedora 32 I needed to copy
51+
/usr/i686-w64-mingw32/sys-root/mingw/bin/libgcc_s_dw2-1.dll
52+
/usr/i686-w64-mingw32/sys-root/mingw/bin/libwinpthread-1.dll
53+
On Fedora 23 I needed to copy
5354
/usr/i686-w64-mingw32/sys-root/mingw/bin/libgcc_s_sjlj-1.dll
5455
/usr/i686-w64-mingw32/sys-root/mingw/bin/libwinpthread-1.dll
5556
On Gentoo I needed to copy

0 commit comments

Comments
 (0)