Skip to content

Commit cb1c184

Browse files
committed
Fixed x32 build pipeline. Fixed #24
1 parent 5070afa commit cb1c184

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
.DS_Store
2-
src/PyAudio.egg-info
2+
**/**/*.egg-info
33
/build/
44
dist/
55
docs/
66
MANIFEST
77
__pycache__
8-
.idea/
8+
.idea/
9+
wheelhouse/

cibuildwheel_before_all.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
make "clean"
3+
make clean
44
W_DIR="wheelhouse"
55
if [[ -d "$W_DIR" && "$(ls -A $W_DIR)" ]]
66
then
@@ -13,14 +13,20 @@ cd "portaudio_v19/"
1313

1414
#x64
1515
make clean
16+
dos2unix libtool
17+
make clean
1618
./configure --with-winapi=wasapi,wmme,directx --enable-shared=no --host=x86_64-w64-mingw32
19+
dos2unix libtool
1720
make onlylib
1821
cp lib/.libs/libportaudio.a lib_dist/libportaudio-x86_64.a
1922

2023
#x32
2124
make clean
25+
dos2unix libtool
26+
make clean
2227
./configure --with-winapi=wasapi,wmme,directx --enable-shared=no --host=i686-w64-mingw32
28+
dos2unix libtool
2329
make onlylib
2430
cp lib/.libs/libportaudio.a lib_dist/libportaudio-x86.a
2531

26-
export PAWP_C_C_FLAG="TRUE"
32+
export PAWP_C_C_FLAG="TRUE"

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ def setup_extension():
8484
os.environ["CC"] = "x86_64-w64-mingw32-gcc"
8585
else:
8686
os.environ["CC"] = "i686-w64-mingw32-gcc"
87+
extra_link_args.append("-static-libgcc")
8788

8889
if WIN_VCPKG_PATH:
8990
include_dirs += [os.path.join(WIN_VCPKG_PATH, 'include')]

0 commit comments

Comments
 (0)