| @@ -133,6 +133,7 @@ if [ "${WIN32}" -eq 1 ]; then | |||||
| remove_file portaudio19 "${PORTAUDIO_VERSION}" "src/hostapi/wasapi/mingw-include/sal.h" | remove_file portaudio19 "${PORTAUDIO_VERSION}" "src/hostapi/wasapi/mingw-include/sal.h" | ||||
| remove_file portaudio19 "${PORTAUDIO_VERSION}" "src/hostapi/wasapi/mingw-include/structuredquery.h" | remove_file portaudio19 "${PORTAUDIO_VERSION}" "src/hostapi/wasapi/mingw-include/structuredquery.h" | ||||
| build_autoconf portaudio19 "${PORTAUDIO_VERSION}" "--enable-cxx --with-asiodir="${ASIO_DIR}" --with-winapi=asio,directx,wasapi,wdmks,wmme" | build_autoconf portaudio19 "${PORTAUDIO_VERSION}" "--enable-cxx --with-asiodir="${ASIO_DIR}" --with-winapi=asio,directx,wasapi,wdmks,wmme" | ||||
| install_file portaudio19 "${PORTAUDIO_VERSION}" "include/pa_asio.h" "include" | |||||
| fi | fi | ||||
| # --------------------------------------------------------------------------------------------------------------------- | # --------------------------------------------------------------------------------------------------------------------- | ||||
| @@ -54,6 +54,8 @@ fi | |||||
| if [ "${MACOS}" -eq 1 ]; then | if [ "${MACOS}" -eq 1 ]; then | ||||
| jack2_args+=" --prefix=${jack2_extra_prefix}" | jack2_args+=" --prefix=${jack2_extra_prefix}" | ||||
| jack2_args+=" --destdir="${jack2_prefix}"" | jack2_args+=" --destdir="${jack2_prefix}"" | ||||
| elif [ "${WIN32}" -eq 1 ]; then | |||||
| jack2_args+=" --static" | |||||
| fi | fi | ||||
| if [ "${JACK2_VERSION}" = "git" ]; then | if [ "${JACK2_VERSION}" = "git" ]; then | ||||
| @@ -37,7 +37,34 @@ fi | |||||
| # --------------------------------------------------------------------------------------------------------------------- | # --------------------------------------------------------------------------------------------------------------------- | ||||
| if [ "${MACOS}" -eq 1 ]; then | |||||
| if [ "${WIN32}" -eq 1 ]; then | |||||
| dlfile="${PAWPAW_DOWNLOADDIR}/innosetup-6.0.5.exe" | |||||
| innodir="${PAWPAW_BUILDDIR}/innosetup-6.0.5" | |||||
| iscc="${innodir}/drive_c/InnoSeup/ISCC.exe" | |||||
| wine="env WINEARCH="${PAWPAW_TARGET}" WINEDLLOVERRIDES="mscoree,mshtml=" WINEPREFIX="${innodir}" wine" | |||||
| if [ ! -f "${dlfile}" ]; then | |||||
| # FIXME proper dl version | |||||
| curl -L https://jrsoftware.org/download.php/is.exe?site=2 -o "${dlfile}" | |||||
| fi | |||||
| if [ ! -d "${innodir}"/drive_c ]; then | |||||
| ${wine}boot -u | |||||
| fi | |||||
| if [ ! -f "${innodir}"/drive_c/InnoSeup/ISCC.exe ]; then | |||||
| ${wine} "${dlfile}" /allusers /dir=C:\\InnoSeup /nocancel /norestart /verysilent | |||||
| fi | |||||
| pushd "${PAWPAW_BUILDDIR}/jack2-${JACK2_VERSION}/windows/inno" | |||||
| echo "#define VERSION \"${JACK2_VERSION}\"" > "version.iss" | |||||
| ln -sf "${PAWPAW_PREFIX}/bin/Qt5"{Core,Gui,Network,Widgets,Xml}".dll" . | |||||
| ln -sf "${PAWPAW_PREFIX}/lib/qt5/plugins/platforms/qwindows.dll" . | |||||
| ln -sf "${jack2_prefix}" "${PAWPAW_TARGET}" | |||||
| ${wine} "${iscc}" "${PAWPAW_TARGET}.iss" | |||||
| popd | |||||
| elif [ "${MACOS}" -eq 1 ]; then | |||||
| for f in $(ls "${jack2_prefix}${jack2_extra_prefix}/bin"/* \ | for f in $(ls "${jack2_prefix}${jack2_extra_prefix}/bin"/* \ | ||||
| "${jack2_prefix}${jack2_extra_prefix}/lib"/*.dylib \ | "${jack2_prefix}${jack2_extra_prefix}/lib"/*.dylib \ | ||||
| "${jack2_prefix}${jack2_extra_prefix}/lib/jack"/*); do | "${jack2_prefix}${jack2_extra_prefix}/lib/jack"/*); do | ||||
| @@ -481,6 +481,21 @@ function copy_file() { | |||||
| fi | fi | ||||
| } | } | ||||
| function install_file() { | |||||
| local name="${1}" | |||||
| local version="${2}" | |||||
| local source="${3}" | |||||
| local targetdir="${4}" | |||||
| local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" | |||||
| if [ ! -e "${PAWPAW_PREFIX}/${targetdir}/$(basename ${source})" ]; then | |||||
| pushd "${pkgdir}" | |||||
| cp -v "${source}" "${PAWPAW_PREFIX}/${targetdir}/" | |||||
| popd | |||||
| fi | |||||
| } | |||||
| function link_file() { | function link_file() { | ||||
| local name="${1}" | local name="${1}" | ||||
| local version="${2}" | local version="${2}" | ||||