3 files changed, 16 insertions, 11 deletions
diff --git a/ports/soundtouch/CMakeLists.txt b/ports/soundtouch/CMakeLists.txt
index a15daefe4..075c8ee2d 100644
--- a/ports/soundtouch/CMakeLists.txt
+++ b/ports/soundtouch/CMakeLists.txt
@@ -13,15 +13,18 @@ else()
     set(TYPE_SUFFIX $<$<Config:Debug>:D>)
 endif()
 
-file(GLOB SOUNDTOUCH_SOURCES source/SoundTouch/*.cpp)
+configure_file("${CMAKE_CURRENT_LIST_DIR}/include/soundtouch_config.h.in" ${CMAKE_CURRENT_BINARY_DIR}/include/soundtouch_config.h)
+
+file(GLOB SOUNDTOUCH_SOURCES "${CMAKE_CURRENT_LIST_DIR}/source/SoundTouch/*.cpp")
 add_library(libsoundtouch ${SOUNDTOUCH_SOURCES})
-target_include_directories(libsoundtouch PUBLIC include)
+target_include_directories(libsoundtouch PUBLIC "${CMAKE_CURRENT_LIST_DIR}/include")
+target_include_directories(libsoundtouch PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/include")
 set_target_properties(libsoundtouch PROPERTIES OUTPUT_NAME SoundTouch${TYPE_SUFFIX}${ARCH_SUFFIX})
-if(BUILD_SHARED_LIBS)
+if(WIN32 AND BUILD_SHARED_LIBS)
     target_compile_definitions(libsoundtouch PRIVATE -DDLL_EXPORTS)
     target_sources(libsoundtouch PRIVATE
-        source/SoundTouchDLL/SoundTouchDLL.cpp
-        source/SoundTouchDLL/SoundTouchDLL.rc
+        "${CMAKE_CURRENT_LIST_DIR}/source/SoundTouchDLL/SoundTouchDLL.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/source/SoundTouchDLL/SoundTouchDLL.rc"
     )
 endif()
 
diff --git a/ports/soundtouch/CONTROL b/ports/soundtouch/CONTROL
index 2e358f55e..7ce1c2ba6 100644
--- a/ports/soundtouch/CONTROL
+++ b/ports/soundtouch/CONTROL
@@ -1,5 +1,5 @@
 Source: soundtouch
-Version: 2.0.0-2
+Version: 2.0.0-4
 Homepage: https://www.surina.net/soundtouch
 Description: SoundTouch is an open-source audio processing library for changing the Tempo, Pitch and Playback Rates of audio streams or audio files.
-Build-Depends: atlmfc
+Build-Depends: atlmfc (windows)
diff --git a/ports/soundtouch/portfile.cmake b/ports/soundtouch/portfile.cmake
index c9fbd3623..5f77e2a63 100644
--- a/ports/soundtouch/portfile.cmake
+++ b/ports/soundtouch/portfile.cmake
@@ -7,14 +7,17 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
 endif()
 
 set(VERSION 2.0.0)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/soundtouch)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://www.surina.net/soundtouch/soundtouch-${VERSION}.zip"
     FILENAME "soundtouch-${VERSION}.zip"
     SHA512 50ef36b6cd21c16e235b908c5518e29b159b11f658a014c47fe767d3d8acebaefefec0ce253b4ed322cbd26387c69c0ed464ddace0c098e61d56d55c198117a5
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
@@ -27,5 +30,4 @@ vcpkg_install_cmake()
 
 file(INSTALL ${SOURCE_PATH}/source/SoundTouchDLL/SoundTouchDLL.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 
-file(COPY ${SOURCE_PATH}/COPYING.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/soundtouch)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/soundtouch/COPYING.TXT ${CURRENT_PACKAGES_DIR}/share/soundtouch/copyright)
+file(INSTALL ${SOURCE_PATH}/COPYING.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)