me/portaudio
Watch
1
0
Fork
You've already forked portaudio
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

configure: add INCLUDES for mingw build

Browse source 
Previously, only portaudio.h was installed when building under mingw using
make. This behavior differs from CMakeLists.txt PA_PUBLIC_INCLUDES where
pa_win_*.h header files are installed.

To cross-compile using MXE (https://mxe.cc/) we need pa_win_*.h headers.
Add them to configure.in so that they are installed.

Patch by Stefan Hajnoczi
This commit is contained in:
Phil Burk 2021-01-29 12:15:15 -08:00
commit 9756c86061
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
configure.in
View file

@ -287,6 +287,7 @@ case "${host_os}" in
#VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""
#CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO"
CFLAGS="$CFLAGS -I$DXDIR/include -UPA_USE_DS -DPA_USE_DS=1"
INCLUDES="$INCLUDES pa_win_ds.h pa_win_waveformat.h"
fi
if [[ "x$with_asio" = "xyes" ]]; then
@ -295,6 +296,7 @@ case "${host_os}" in
LIBS="${LIBS} -lwinmm -lm -lole32 -luuid"
DLL_LIBS="${DLL_LIBS} -lwinmm -lm -lole32 -luuid"
CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -I\$(top_srcdir)/src/hostapi/asio -I$ASIODIR/host/pc -I$ASIODIR/common -I$ASIODIR/host -UPA_USE_ASIO -DPA_USE_ASIO=1 -DWINDOWS"
INCLUDES="$INCLUDES pa_asio.h"
dnl Setting the windows version flags below resolves a conflict between Interlocked*
dnl definitions in mingw winbase.h and Interlocked* hacks in ASIO SDK combase.h
@ -313,6 +315,7 @@ case "${host_os}" in
#VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""
#CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO"
CFLAGS="$CFLAGS -I$DXDIR/include -UPA_USE_WDMKS -DPA_USE_WDMKS=1"
INCLUDES="$INCLUDES pa_win_wdmks.h"
fi
if [[ "x$with_wmme" = "xyes" ]]; then
@ -320,6 +323,7 @@ case "${host_os}" in
LIBS="${LIBS} -lwinmm -lm -lole32 -luuid"
DLL_LIBS="${DLL_LIBS} -lwinmm"
CFLAGS="$CFLAGS -UPA_USE_WMME -DPA_USE_WMME=1"
INCLUDES="$INCLUDES pa_win_wmme.h pa_win_waveformat.h"
fi
if [[ "x$with_wasapi" = "xyes" ]]; then
@ -327,6 +331,7 @@ case "${host_os}" in
LIBS="${LIBS} -lwinmm -lm -lole32 -luuid"
DLL_LIBS="${DLL_LIBS} -lwinmm -lole32"
CFLAGS="$CFLAGS -UPA_USE_WASAPI -DPA_USE_WASAPI=1"
INCLUDES="$INCLUDES pa_win_wasapi.h pa_win_waveformat.h"
fi
;;