Add 32-bit Windows and consume Pthreads from NuGet

.appveyor.yml

@@ -1,41 +1,43 @@
 init:
- # -ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-
+# -ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+
+version: 1.0.0.{build}
+
 configuration:
   - Release
   - Debug
 
 image:
   - Visual Studio 2015
-  - Visual Studio 2013
 
 platform:
   - x64
+  - x86
 
 build_script:
-  # build pthread
-  - git clone https://github.com/GerHobbelt/pthread-win32.git C:/pthread-src
-  - ps: "if ( $Env:APPVEYOR_BUILD_WORKER_IMAGE -eq 'Visual Studio 2013' ) { $VS_VERSION='2013' } else { $VS_VERSION='2015' }"
-  - ps: "msbuild C:/pthread-src/pthread.${VS_VERSION}.sln /p:Configuration=$Env:CONFIGURATION /p:Platform=x64"
-  - ps: mkdir C:/pthread-win32
-  - ps: mkdir C:/pthread-win32/include
-  - ps: mkdir C:/pthread-win32/lib
-  - ps: cp C:/pthread-src/*.h C:/pthread-win32/include
-  - ps: cp C:/pthread-src/bin/x64_MSVC${VS_VERSION}.${Env:CONFIGURATION}/pthread_lib.lib C:/pthread-win32/lib
+  # prep shared variables
+  - ps: if ( $Env:PLATFORM -eq 'x86' ) { $DEVENV_PLATFORM = 'Win32' } else { $DEVENV_PLATFORM = 'x64' }
+  - ps: if ( $Env:PLATFORM -eq 'x86' ) { $FOLDER_PLATFORM = 'win32' } else { $FOLDER_PLATFORM = 'win64' }
+  - ps: if ( $Env:APPVEYOR_BUILD_WORKER_IMAGE -eq 'Visual Studio 2013' ) { $VS_VERSION='2013' } else { $VS_VERSION='2015' }
+  - ps: $env:VS_VERSION = $VS_VERSION
+  # get pthreads
+  - ps: nuget install cinegy.pthreads-$FOLDER_PLATFORM -version 2.9.1.17
   # build SRT
-  - ps: if ( $VS_VERSION -eq "2013" ) { $CMAKE_GENERATOR = "Visual Studio 12 2013 Win64" } else { $CMAKE_GENERATOR = "Visual Studio 14 2015 Win64" }
-  - ps: if ( $VS_VERSION -eq "2013" ) { $ENABLE_UNITTESTS = "OFF" } else { $ENABLE_UNITTESTS = "ON" }
+  - ps: if ( $VS_VERSION -eq '2015' -and $Env:PLATFORM -eq 'x86' ) { $CMAKE_GENERATOR = 'Visual Studio 14 2015' }
+  - ps: if ( $VS_VERSION -eq '2015' -and $Env:PLATFORM -eq 'x64' ) { $CMAKE_GENERATOR = 'Visual Studio 14 2015 Win64' }
+  - ps: if ( $VS_VERSION -eq '2015' ) { $ENABLE_UNITTESTS = 'ON' } else { $ENABLE_UNITTESTS = 'OFF' }
   - ps: cmake . -G"$CMAKE_GENERATOR" -DCMAKE_BUILD_TYPE=$Env:CONFIGURATION -DENABLE_UNITTESTS="$ENABLE_UNITTESTS"
-  - ps: msbuild SRT.sln /p:Configuration=$Env:CONFIGURATION /p:Platform=x64
-
+  - ps: Update-AppveyorBuild -Version "1.3.4-$Env:APPVEYOR_BUILD_NUMBER"
+  - ps: msbuild SRT.sln /p:Configuration=$Env:CONFIGURATION /p:Platform=$DEVENV_PLATFORM
+
 test_script:
-  - ps: if ( $VS_VERSION -ne "2013" ) { ctest --extra-verbose -C $Env:CONFIGURATION }
+  - ps: if ( $VS_VERSION -eq '2015' ) { ctest --extra-verbose -C $Env:CONFIGURATION }
 
 after_build:
 - cmd: >-
     scripts/gather-package.bat
-        7z a SRT-%APPVEYOR_REPO_BRANCH%-%CONFIGURATION%-%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\package\*
-        appveyor PushArtifact SRT-%APPVEYOR_REPO_BRANCH%-%CONFIGURATION%-%APPVEYOR_BUILD_VERSION%.zip
+        7z a SRT-%APPVEYOR_REPO_BRANCH%-%CONFIGURATION%-Win%PLATFORM%-%VS_VERSION%-%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\package\*
+        appveyor PushArtifact SRT-%APPVEYOR_REPO_BRANCH%-%CONFIGURATION%-Win%PLATFORM%-%VS_VERSION%-%APPVEYOR_BUILD_VERSION%.zip
 
 on_finish:
-#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

.gitignore

@@ -0,0 +1,5 @@
+#ignore Visual Studio Code project elements
+/.vs
+
+#ignore any downloaded nuget packages
+/packages

CMakeLists.txt

@@ -375,6 +375,7 @@ set (haicrypt_libspec VIRTUAL)
 set (srtpack_libspec_common)
 if (srt_libspec_shared)
 	list(APPEND srtpack_libspec_common ${TARGET_srt}_shared)
+
 endif()
 if (srt_libspec_static)
 	list(APPEND srtpack_libspec_common ${TARGET_srt}_static)
@@ -454,14 +455,28 @@ if (PTHREAD_LIBRARY AND PTHREAD_INCLUDE_DIR)
 	message(STATUS "Pthread include dir: ${PTHREAD_INCLUDE_DIR}")
 elseif (WIN32 AND NOT MINGW)
 	# find pthread
-	find_path(PTHREAD_INCLUDE_DIR pthread.h HINTS C:/pthread-win32/include)
+	file(GLOB PTHREAD_INCLUDE_HINT ./packages/cinegy.pthreads-win*/sources)
+	if (PTHREAD_INCLUDE_HINT)
+		message(STATUS "PTHREAD_INCLUDE_HINT value: ${PTHREAD_INCLUDE_HINT}")
+	else()
+		message(FATAL_ERROR "Failed to find PTHREAD_INCLUDE_HINT with GLOB against nuget package.")
+	endif()
+
+	find_path(PTHREAD_INCLUDE_DIR pthread.h HINTS ${PTHREAD_INCLUDE_HINT})
 	if (PTHREAD_INCLUDE_DIR)
 		message(STATUS "Pthread include dir: ${PTHREAD_INCLUDE_DIR}")
 	else()
 		message(FATAL_ERROR "Failed to find pthread.h. Specify PTHREAD_INCLUDE_DIR.")
 	endif()
 
-	find_library(PTHREAD_LIBRARY NAMES pthread pthread_dll pthread_lib HINTS C:/pthread-win32/lib C:/pthread-win64/lib)
+	file(GLOB PTHREAD_LIB_HINT ./packages/cinegy.pthreads-win*/runtimes/win-*/native/release)
+	if (PTHREAD_LIB_HINT)
+		message(STATUS "PTHREAD_LIB_HINT value: ${PTHREAD_LIB_HINT}")
+	else()
+		message(FATAL_ERROR "Failed to find PTHREAD_LIB_HINT with GLOB against nuget package.")
+	endif()
+
+	find_library(PTHREAD_LIBRARY NAMES pthread pthread_dll pthread_lib HINTS ${PTHREAD_LIB_HINT})
 	if (PTHREAD_LIBRARY)
 		message(STATUS "Pthread library: ${PTHREAD_LIBRARY}")
 	else()
@@ -539,7 +554,15 @@ MafReadDir(srtcore filelist.maf
 )
 
 # Auto generated version file and add it to the HEADERS_srt list.
+if(DEFINED ENV{APPVEYOR_BUILD_NUMBER})
+	set(SRT_VERSION_BUILD ON)
+	set(APPVEYOR_BUILD_NUMBER_STRING $ENV{APPVEYOR_BUILD_NUMBER})
+	message(STATUS "AppVeyor build environment detected: Adding build number to version header")
+else()
+	message(STATUS "AppVeyor build environment NOT detected: NOT adding build number to version header")
+endif()
 configure_file("srtcore/version.h.in" "version.h" @ONLY)
+
 list(INSERT HEADERS_srt 0 "${CMAKE_CURRENT_BINARY_DIR}/version.h")
 include_directories("${CMAKE_CURRENT_BINARY_DIR}")
 
@@ -550,6 +573,15 @@ if (ENABLE_SHARED)
 	foreach (tar srt_virtual haicrypt_virtual)
 		set_target_properties(${tar} PROPERTIES POSITION_INDEPENDENT_CODE 1)
 	endforeach()
+
+	#add resource files to shared library, to set DLL metadata on Windows DLLs
+	if (WIN32 AND NOT MINGW)
+		MafReadDir(srtcore filelist_win32_shared.maf
+			SOURCES SOURCES_srt_shared_win32
+			PRIVATE_HEADERS HEADERS_srt_shared_win32
+		)
+		message(STATUS "WINDOWS detected: Adding sources to SRT shared project: ${SOURCES_srt_shared_win32}")
+	endif()
 endif()
 
 # Manual handling of dependency on virtual library
@@ -559,7 +591,7 @@ endif()
 set (VIRTUAL_srt $<TARGET_OBJECTS:srt_virtual> $<TARGET_OBJECTS:haicrypt_virtual>)
 
 if (srt_libspec_shared)
-	add_library(${TARGET_srt}_shared SHARED ${OBJECT_LIB_SUPPORT} ${VIRTUAL_srt})
+	add_library(${TARGET_srt}_shared SHARED ${OBJECT_LIB_SUPPORT} ${VIRTUAL_srt} ${SOURCES_srt_shared_win32} ${HEADERS_srt_shared_win32})
 	# shared libraries need PIC
 	set (CMAKE_POSITION_INDEPENDENT_CODE ON)
 	set_property(TARGET ${TARGET_srt}_shared PROPERTY OUTPUT_NAME ${TARGET_srt})
@@ -570,6 +602,7 @@ if (srt_libspec_shared)
 	endif()
 	if (MICROSOFT)
 		target_link_libraries(${TARGET_srt}_shared PRIVATE ws2_32.lib)
+		set_target_properties(${TARGET_srt}_shared PROPERTIES LINK_FLAGS "/DELAYLOAD:libeay32.dll")
 	elseif (MINGW)
 		target_link_libraries(${TARGET_srt}_shared PRIVATE wsock32.lib ws2_32.lib)
 	elseif (APPLE)

nuget.config

@@ -0,0 +1,11 @@
+<configuration>
+    <config>
+        <add key="dependencyVersion" value="Highest" />
+        <add key="globalPackagesFolder" value="c:\packages" />
+        <add key="repositoryPath" value="packages" />
+    </config>
+    <packageSources>
+        <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+        <!--<add key="Local Source" value="D:\Data\Dev\LocalNuget" />-->
+    </packageSources>
+</configuration>

scripts/gather-package.bat

@@ -1,13 +1,22 @@
 rem Create empty directories for package bundle
 @echo off
 
+IF "%PLATFORM%"=="x86" (
+    SET FOLDER_PLATFORM="32"
+) ELSE IF "%PLATFORM%"=="x64" (
+    SET FOLDER_PLATFORM="64"
+) ELSE (
+    echo "Platform %PLATFORM% is not supported"
+    exit 1
+)
+
 md %APPVEYOR_BUILD_FOLDER%\package
 md %APPVEYOR_BUILD_FOLDER%\package\include
 md %APPVEYOR_BUILD_FOLDER%\package\include\win
 md %APPVEYOR_BUILD_FOLDER%\package\bin        
 md %APPVEYOR_BUILD_FOLDER%\package\lib
-md %APPVEYOR_BUILD_FOLDER%\package\pthread-win32
-md %APPVEYOR_BUILD_FOLDER%\package\openssl-win64
+rem md %APPVEYOR_BUILD_FOLDER%\package\pthread-win%FOLDER_PLATFORM%
+md %APPVEYOR_BUILD_FOLDER%\package\openssl-win%FOLDER_PLATFORM%
 
 rem Gather SRT includes, binaries and libs
 copy %APPVEYOR_BUILD_FOLDER%\version.h %APPVEYOR_BUILD_FOLDER%\package\include\
@@ -18,9 +27,11 @@ copy %APPVEYOR_BUILD_FOLDER%\common\win\*.h %APPVEYOR_BUILD_FOLDER%\package\incl
 copy %APPVEYOR_BUILD_FOLDER%\%CONFIGURATION%\*.exe %APPVEYOR_BUILD_FOLDER%\package\bin\
 copy %APPVEYOR_BUILD_FOLDER%\%CONFIGURATION%\*.dll %APPVEYOR_BUILD_FOLDER%\package\bin\
 copy %APPVEYOR_BUILD_FOLDER%\%CONFIGURATION%\*.lib %APPVEYOR_BUILD_FOLDER%\package\lib\
-copy %APPVEYOR_BUILD_FOLDER%\%CONFIGURATION%\*.lib %APPVEYOR_BUILD_FOLDER%\package\lib\
+IF "%CONFIGURATION%"=="Debug" (
+    copy %APPVEYOR_BUILD_FOLDER%\%CONFIGURATION%\*.pdb %APPVEYOR_BUILD_FOLDER%\package\bin\
+)
 
 rem gather 3rd party elements
-(robocopy c:\openssl-win64\ %APPVEYOR_BUILD_FOLDER%\package\openssl-win64 /s /e /np) ^& IF %ERRORLEVEL% GTR 1 exit %ERRORLEVEL%
-(robocopy c:\pthread-win32\ %APPVEYOR_BUILD_FOLDER%\package\pthread-win32 /s /e /np) ^& IF %ERRORLEVEL% GTR 1 exit %ERRORLEVEL%
+(robocopy c:\openssl-win%FOLDER_PLATFORM%\ %APPVEYOR_BUILD_FOLDER%\package\openssl-win%FOLDER_PLATFORM% /s /e /np) ^& IF %ERRORLEVEL% GTR 1 exit %ERRORLEVEL%
+rem (robocopy c:\pthread-win%FOLDER_PLATFORM%\ %APPVEYOR_BUILD_FOLDER%\package\pthread-win%FOLDER_PLATFORM% /s /e /np) ^& IF %ERRORLEVEL% GTR 1 exit %ERRORLEVEL%
 exit 0

srtcore/filelist_win32_shared.maf

@@ -0,0 +1,7 @@
+
+
+SOURCES
+srt_shared.rc
+
+PRIVATE HEADERS
+../version.h

srtcore/version.h.in

@@ -24,6 +24,7 @@ written by
 #define SRT_VERSION_MAJOR @SRT_VERSION_MAJOR@
 #define SRT_VERSION_MINOR @SRT_VERSION_MINOR@
 #define SRT_VERSION_PATCH @SRT_VERSION_PATCH@
+#cmakedefine SRT_VERSION_BUILD @APPVEYOR_BUILD_NUMBER_STRING@
 
 #define SRT_VERSION_STRING "@SRT_VERSION@"
 #define SRT_VERSION_VALUE \