2019

voiceip · Mar 21, 2022 · 37e1140 · 37e1140
1 parent e0e09f8
commit 37e1140
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 26 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -33,10 +33,10 @@ jobs:
     - name: Install Boost
       if: steps.cache-boost.outputs.cache-hit != 'true'
       run: |
-        # Use the boost_1_72_0-msvc-14.1-64.exe for Windows 2016
-        $Url = "https://boost.teeks99.com/bin/1.68.0/boost_1_68_0-msvc-14.0-32.exe"
+        # Use the boost_1_74_0-msvc-14.1-64.exe for Windows 2019
+        $Url = "https://onboardcloud.dl.sourceforge.net/project/boost/boost-binaries/1.74.0/boost_1_74_0-msvc-14.2-32.exe"
         (New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\boost.exe")
-        Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=C:\local\boost_1_68_0"
+        Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=C:\local\boost_1_74_0"
 
     - name: Install Scoop & Binaries
       run : |

diff --git a/appveyor.yml b/appveyor.yml
@@ -34,13 +34,6 @@ build_script:
 
     cmd /c subst E: C:\projects\tinyphone
 
-    cd E:\lib\curl\
-    ls
-    .\buildconf.bat
-    cd E:\lib\curl\winbuild
-
-    ls
-
     pushd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools"
     cmd /c "VsDevCmd.bat&set" |
     foreach {
@@ -51,16 +44,15 @@ build_script:
     popd
     Write-Host "`nVisual Studio 2019 Command Prompt variables set." -ForegroundColor Yellow
 
-    where.exe msbuild.exe
+    cd E:\lib\curl\
+    ls
+    .\buildconf.bat
+    cd E:\lib\curl\winbuild
 
+    where.exe msbuild.exe
     nmake /f Makefile.vc mode=dll VC=19 DEBUG=no
 
-    cd E:\lib\curl\builds
-
-    ls 
-
     cmd /c MKLINK /D E:\lib\curl\builds\libcurl-vc-x86-release-dll-ipv6-sspi-winssl E:\lib\curl\builds\libcurl-vc19-x86-release-dll-ipv6-sspi-winssl
-    ls E:\lib\curl\builds
     cmd /c .\libcurl-vc19-x86-release-dll-ipv6-sspi-winssl\bin\curl.exe https://wttr.in/bangalore
 
     #G729

diff --git a/distribution/docker/release.ps1 b/distribution/docker/release.ps1
@@ -17,45 +17,45 @@ cd E:\lib\curl\
 cd E:\lib\curl\winbuild
 
 where.exe msbuild.exe
-nmake /f Makefile.vc mode=dll VC=15 MACHINE=x86 DEBUG=no
+nmake /f Makefile.vc mode=dll VC=19 MACHINE=x86 DEBUG=no
 
-cmd /c MKLINK /D E:\lib\curl\builds\libcurl-vc-x86-release-dll-ipv6-sspi-winssl E:\lib\curl\builds\libcurl-vc15-x86-release-dll-ipv6-sspi-winssl
-cmd /c E:\lib\curl\builds\libcurl-vc15-x86-release-dll-ipv6-sspi-winssl\bin\curl.exe https://wttr.in/bangalore
+cmd /c MKLINK /D E:\lib\curl\builds\libcurl-vc-x86-release-dll-ipv6-sspi-winssl E:\lib\curl\builds\libcurl-vc19-x86-release-dll-ipv6-sspi-winssl
+cmd /c E:\lib\curl\builds\libcurl-vc19-x86-release-dll-ipv6-sspi-winssl\bin\curl.exe https://wttr.in/bangalore
 
 
 #G729
 cd E:\lib\bcg729\build\
-cmake ..
-msbuild /m bcg729.sln /p:Configuration=$BuildMode /p:Platform=Win32
+cmake .. -A Win32
+msbuild /m bcg729.sln /p:Configuration=$BuildMode /p:Platform=Win32 /p:PlatformToolset=v142
 
 #cryptopp
 cd E:\lib\cryptopp
-msbuild /m cryptlib.vcxproj /p:Configuration=$BuildMode /p:Platform=Win32 /p:PlatformToolset=v140_xp
+msbuild /m cryptlib.vcxproj /p:Configuration=$BuildMode /p:Platform=Win32 /p:PlatformToolset=v142
 
 #portaudio
 $wc = New-Object net.webclient; $wc.Downloadfile("https://download.steinberg.net/sdk_downloads/asiosdk_2.3.3_2019-06-14.zip", "E:\lib\portaudio\src\hostapi\asio\asiosdk_2.3.3_2019-06-14.zip")
 cd E:\lib\portaudio\src\hostapi\asio
 unzip asiosdk_2.3.3_2019-06-14.zip
 mv asiosdk_2.3.3_2019-06-14 ASIOSDK
 cd E:\lib\portaudio\build\msvc
-msbuild /m portaudio.sln /p:Configuration=$BuildMode /p:Platform=Win32
+msbuild /m portaudio.sln /p:Configuration=$BuildMode /p:Platform=Win32 /p:PlatformToolset=v142 /p:WindowsTargetPlatformVersion=10.0
 
 #pjproject
 cd E:\lib\pjproject
-msbuild /m pjproject-vs14.sln -target:libpjproject:Rebuild /p:Configuration=$BuildMode-Static /p:Platform=Win32
+msbuild /m pjproject-vs14.sln -target:libpjproject:Rebuild /p:Configuration=$BuildMode-Static /p:Platform=Win32 /p:PlatformToolset=v142
 
 #statsd-cpp
 cd E:\lib\statsd-cpp
 cmake .
-msbuild /m statsd-cpp.vcxproj /p:Configuration=$BuildMode /p:Platform=Win32
+msbuild /m statsd-cpp.vcxproj /p:Configuration=$BuildMode /p:Platform=Win32 /p:PlatformToolset=v142 /p:WindowsTargetPlatformVersion=10.0
 
 #tinyphone
 cd E:\tinyphone
 sed -i 's/stampver.inf.*\$/stampver.inf $/g' tinyphone.vcxproj
 
 #msbuild /m tinyphone.sln -target:tinyphone /p:Configuration=$BuildMode /p:Platform=x86
 #msbuild /m tinyphone.sln -target:tinyphone:Rebuild /p:Configuration=$BuildMode /p:Platform=x86
-msbuild /m tinyphone.sln /p:Configuration=$BuildMode /p:Platform=x86
+msbuild /m tinyphone.sln /p:Configuration=$BuildMode /p:Platform=x86 /p:PlatformToolset=v142 /p:WindowsTargetPlatformVersion=10.0
 
 
 #required for github-ci permission issue.