From: Phil Burk <philburk@mobileer.com>
Date: Fri, 29 Jan 2021 20:15:15 +0000 (-0800)
Subject: configure: add INCLUDES for mingw build
X-Git-Tag: v19.7.0~21
X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=9756c8606130881bd70904128c79ebad8e61ba28;p=portaudio

configure: add INCLUDES for mingw build

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
---

diff --git a/configure b/configure
index 81c70f9..511ae76 100755
Binary files a/configure and b/configure differ
diff --git a/configure.in b/configure.in
index 86048bd..3a7f7fa 100644
--- a/configure.in
+++ b/configure.in
@@ -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
         ;;