diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 6b3822b..1b91ab1 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -13,9 +13,9 @@ on:
jobs:
tinyphone_docker_job:
- if: github.event.label.name == 'ci/github' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'release'
+ # if: github.event.label.name == 'ci/github' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'release'
name: Build Tinyphone
- runs-on: windows-2016
+ runs-on: windows-2019
steps:
- name: Checkout
uses: actions/checkout@v2
@@ -43,11 +43,11 @@ jobs:
id: vars
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
- name: Build and Push tinyphone_base to registry
- if: contains(steps.changed_files.outputs.modified, 'Dockerfile.base')
+ # if: contains(steps.changed_files.outputs.modified, 'Dockerfile.base')
run: |
- docker build --file=./distribution/docker/Dockerfile.base -t ghcr.io/${{ github.repository_owner }}/tinyphone_base:latest -t ghcr.io/${{ github.repository_owner }}/tinyphone_base:${{ steps.vars.outputs.sha_short }} ./distribution/docker
- docker push ghcr.io/${{ github.repository_owner }}/tinyphone_base:latest
- docker push ghcr.io/${{ github.repository_owner }}/tinyphone_base:${{ steps.vars.outputs.sha_short }}
+ docker build --file=./distribution/docker/Dockerfile.base -t ghcr.io/${{ github.repository_owner }}/tinyphone_base:vc2019 -t ghcr.io/${{ github.repository_owner }}/tinyphone_base:${{ steps.vars.outputs.sha_short }} ./distribution/docker
+ docker push ghcr.io/${{ github.repository_owner }}/tinyphone_base:vc2019
+ # docker push ghcr.io/${{ github.repository_owner }}/tinyphone_base:${{ steps.vars.outputs.sha_short }}
- name: Update CodeDir
run : |
sed -i 's/$env:CodeDir/C:\\Code\\tinyphone/g' ./distribution/docker/release.ps1
@@ -55,7 +55,7 @@ jobs:
shell : bash
- name: Build tinyphone
run: |
- cat ./distribution/docker/release.ps1 | docker run -v ${PWD}:"C:\Code\tinyphone" -i ghcr.io/${{ github.repository_owner }}/tinyphone_base:latest
+ cat ./distribution/docker/release.ps1 | docker run -v ${PWD}:"C:\Code\tinyphone" -i ghcr.io/${{ github.repository_owner }}/tinyphone_base:vc2019
- name: Upload Artifacts
uses: actions/upload-artifact@v2
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 21326d6..613f888 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ on:
jobs:
tinyphone_win_job:
name: Build Tinyphone Windows
- runs-on: windows-2016
+ runs-on: windows-2019
steps:
- name: Checkout
uses: actions/checkout@v2
@@ -28,15 +28,15 @@ jobs:
uses: actions/cache@v2
id: cache-boost
with:
- path: C:\local\boost_1_68_0
- key: boost
+ path: C:\local\boost_1_74_0
+ key: boost-74
- 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/.gitmodules b/.gitmodules
index dbd2c75..a50af69 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
[submodule "lib/pjproject"]
path = lib/pjproject
- url = git@github.com:voiceip/pjproject.git
+ url = https://github.com/voiceip/pjproject.git
[submodule "lib/vp8vfw"]
path = lib/vp8vfw
url = https://github.com/XhmikosR/vp8vfw.git
@@ -9,7 +9,7 @@
url = https://github.com/xiph/opus.git
[submodule "lib/crow"]
path = lib/crow
- url = git@github.com:kingster/Crow.git
+ url = https://github.com/kingster/Crow.git
[submodule "lib/boost"]
path = lib/boost
url = https://github.com/boostorg/boost.git
@@ -21,16 +21,16 @@
url = https://github.com/curl/curl.git
[submodule "lib/bcg729"]
path = lib/bcg729
- url = git@github.com:BelledonneCommunications/bcg729.git
+ url = https://github.com/BelledonneCommunications/bcg729.git
[submodule "lib/cryptopp"]
path = lib/cryptopp
- url = git@github.com:weidai11/cryptopp.git
+ url = https://github.com/weidai11/cryptopp.git
[submodule "lib/portaudio"]
path = lib/portaudio
- url = git@github.com:voiceip/portaudio.git
+ url = https://github.com/voiceip/portaudio.git
[submodule "lib/statsd-cpp"]
path = lib/statsd-cpp
- url = git@github.com:voiceip/statsd-cpp.git
+ url = https://github.com/voiceip/statsd-cpp.git
[submodule "tinyphone-osx/vendor/boost"]
path = tinyphone-osx/vendor/boost
- url = git@github.com:faithfracture/Apple-Boost-BuildScript.git
+ url = https://github.com/faithfracture/Apple-Boost-BuildScript.git
diff --git a/appveyor.yml b/appveyor.yml
index 2a09af2..a57608c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
version: 1.0.{build}
-image: Visual Studio 2017
+image: Visual Studio 2019
clone_depth: 5
init:
- ps: >-
@@ -10,10 +10,10 @@ branches:
only:
- master
install:
-- appveyor DownloadFile https://master.dl.sourceforge.net/project/boost/boost-binaries/1.68.0/boost_1_68_0-msvc-14.0-32.exe
-- call boost_1_68_0-msvc-14.0-32.exe /SILENT
+- appveyor DownloadFile https://onboardcloud.dl.sourceforge.net/project/boost/boost-binaries/1.74.0/boost_1_74_0-msvc-14.2-32.exe
+- call boost_1_74_0-msvc-14.2-32.exe /SILENT
- ps : |
- ls "C:\local\boost_1_68_0"
+ ls "C:\local\boost_1_74_0"
# Install Scoop
iwr -useb get.scoop.sh -outfile 'install_scoop.ps1'
@@ -34,14 +34,7 @@ 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\2017\Community\Common7\Tools"
+ pushd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools"
cmd /c "VsDevCmd.bat&set" |
foreach {
if ($_ -match "=") {
@@ -49,28 +42,27 @@ build_script:
}
}
popd
- Write-Host "`nVisual Studio 2017 Command Prompt variables set." -ForegroundColor Yellow
+ Write-Host "`nVisual Studio 2019 Command Prompt variables set." -ForegroundColor Yellow
- where.exe msbuild.exe
-
- nmake /f Makefile.vc mode=dll VC=15 DEBUG=no
-
- cd E:\lib\curl\builds
+ cd E:\lib\curl\
+ ls
+ .\buildconf.bat
+ cd E:\lib\curl\winbuild
- ls
+ where.exe msbuild.exe
+ nmake /f Makefile.vc mode=dll VC=19 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
- ls E:\lib\curl\builds
- cmd /c .\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 .\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
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
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
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
$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")
@@ -78,23 +70,23 @@ build_script:
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
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
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
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
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
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
cd E:\tinyphone
sed -i 's/stampver.inf.*\$/stampver.inf $/g' tinyphone.vcxproj
- 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
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
Write-Host "`nBuild Completed." -ForegroundColor Yellow
diff --git a/distribution/docker/Dockerfile.base b/distribution/docker/Dockerfile.base
index a02acd7..6106f99 100644
--- a/distribution/docker/Dockerfile.base
+++ b/distribution/docker/Dockerfile.base
@@ -1,5 +1,5 @@
# escape=`
-FROM mcr.microsoft.com/dotnet/framework/runtime:3.5-windowsservercore-ltsc2016
+FROM mcr.microsoft.com/dotnet/framework/runtime:3.5-windowsservercore-ltsc2019
MAINTAINER Kinshuk B (hi@kinsh.uk)
RUN powershell.exe mkdir C:\BuildTools
@@ -12,14 +12,15 @@ COPY Install.cmd C:\TEMP\
ADD https://aka.ms/vscollect.exe C:\TEMP\collect.exe
# Download and install Build Tools 14.0
-ADD https://download.microsoft.com/download/E/E/D/EEDF18A8-4AED-4CE0-BEBE-70A83094FC5A/BuildTools_Full.exe C:\TEMP\msbuild14.exe
-RUN start /wait C:\TEMP\msbuild14.exe /q /full /log C:\TEMP\msbuild14.log
+# ADD https://download.microsoft.com/download/E/E/D/EEDF18A8-4AED-4CE0-BEBE-70A83094FC5A/BuildTools_Full.exe C:\TEMP\msbuild14.exe
+# RUN start /wait C:\TEMP\msbuild14.exe /q /full /log C:\TEMP\msbuild14.log
# Download channel for fixed install.
-ADD https://aka.ms/vs/15/release/channel C:\TEMP\VisualStudio.chman
+ADD https://aka.ms/vs/16/release/channel C:\TEMP\VisualStudio.chman
+
+# Download and install Build Tools for Visual Studio 2019 for native desktop workload.
+ADD https://aka.ms/vs/16/release/vs_buildtools.exe C:\TEMP\vs_buildtools.exe
-# Download and install Build Tools for Visual Studio 2017 for native desktop workload.
-ADD https://aka.ms/vs/15/release/vs_buildtools.exe C:\TEMP\vs_buildtools.exe
RUN C:\TEMP\Install.cmd C:\TEMP\vs_buildtools.exe --quiet --wait --norestart --nocache `
--channelUri C:\TEMP\VisualStudio.chman `
--installChannelUri C:\TEMP\VisualStudio.chman `
@@ -27,24 +28,29 @@ RUN C:\TEMP\Install.cmd C:\TEMP\vs_buildtools.exe --quiet --wait --norestart --n
--add Microsoft.Component.MSBuild `
--add Microsoft.VisualStudio.Component.VC.140 `
--add Microsoft.VisualStudio.Component.WinXP `
+ --add Microsoft.VisualStudio.Component.VC.ATLMFC `
+ --add Microsoft.VisualStudio.Component.VC.ATL `
+ --add Microsoft.VisualStudio.Component.VC.Modules.x86.x64 `
# --remove Microsoft.VisualStudio.Component.Windows10SDK.10240 `
# --remove Microsoft.VisualStudio.Component.Windows10SDK.10586 `
# --remove Microsoft.VisualStudio.Component.Windows10SDK.14393 `
- # --remove Microsoft.VisualStudio.Component.Windows81SDK `
+ --remove Microsoft.VisualStudio.Component.Windows81SDK `
--installPath C:\BuildTools
+ # --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTools"
# Verify if .NET isn't broken (bug with the ltsc2016 docker image)
# RUN powershell.exe -Command echo Everything is OK
# Install Scoop
-RUN powershell.exe [Net.ServicePointManager]::SecurityProtocol =[Net.SecurityProtocolType]::Tls12 ; Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh');
+RUN powershell.exe [Net.ServicePointManager]::SecurityProtocol =[Net.SecurityProtocolType]::Tls12 ; (New-Object System.Net.WebClient).DownloadFile('https://get.scoop.sh', 'install_scoop.ps1'); .\install_scoop.ps1 -RunAsAdmin
+
# Install Git & other tools
-RUN powershell.exe scoop install git curl wget cmake win32-openssh unzip make;
+RUN powershell.exe scoop install git curl wget openssh unzip make;
RUN powershell.exe [environment]::setenvironmentvariable('GIT_SSH', (resolve-path (scoop which ssh)), 'USER');
-ADD https://boost.teeks99.com/bin/1.68.0/boost_1_68_0-msvc-14.0-32.exe C:\TEMP\boost_1_68_0-msvc-14.0-32.exe
-RUN cmd.exe /c C:\TEMP\boost_1_68_0-msvc-14.0-32.exe /SILENT
+ADD https://onboardcloud.dl.sourceforge.net/project/boost/boost-binaries/1.74.0/boost_1_74_0-msvc-14.2-32.exe C:\TEMP\boost.exe
+RUN cmd.exe /c C:\TEMP\boost.exe /SILENT
ADD https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311.exe C:\TEMP\wix311.exe
RUN powershell.exe C:\TEMP\Install.cmd C:\TEMP\wix311.exe /install /quiet /norestart
@@ -57,11 +63,7 @@ RUN powershell.exe Remove-Item -LiteralPath 'C:\Program Files\WindowsPowerShell\
WORKDIR C:\BuildTools
-ADD VsDevCmdPowerShell.bat C:\BuildTools\
-ENTRYPOINT C:\BuildTools\VsDevCmdPowerShell.bat
-
-# Start developer command prompt with any other commands specified.
-# ENTRYPOINT C:\BuildTools\Common7\Tools\VsDevCmd.bat &&
+# Define the entry point for the Docker container.
+# This entry point starts the developer command prompt and launches the PowerShell shell.
+ENTRYPOINT ["C:\\BuildTools\\Common7\\Tools\\VsDevCmd.bat", "&&", "powershell.exe", "-NoLogo", "-ExecutionPolicy", "Bypass"]
-# Default to PowerShell if no other command specified.
-# CMD ["powershell.exe", "-NoLogo", "-ExecutionPolicy", "Bypass"]
diff --git a/distribution/docker/VsDevCmdPowerShell.bat b/distribution/docker/VsDevCmdPowerShell.bat
deleted file mode 100644
index be9afe7..0000000
--- a/distribution/docker/VsDevCmdPowerShell.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-call C:\BuildTools\Common7\Tools\VsDevCmd.bat
-powershell.exe -NoLogo -ExecutionPolicy Bypass %*
diff --git a/distribution/docker/release.ps1 b/distribution/docker/release.ps1
index d9d1c31..67daac0 100644
--- a/distribution/docker/release.ps1
+++ b/distribution/docker/release.ps1
@@ -17,20 +17,20 @@ 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")
@@ -38,16 +38,16 @@ 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
@@ -55,7 +55,7 @@ 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.
diff --git a/lib/json b/lib/json
index ef90d62..4f8fba1 160000
--- a/lib/json
+++ b/lib/json
@@ -1 +1 @@
-Subproject commit ef90d62ddf4713f0ca1029d6884997f2a073ca60
+Subproject commit 4f8fba14066156b73f1189a2b8bd568bde5284c5
diff --git a/tinyphone-installer/actions/actions.vcxproj b/tinyphone-installer/actions/actions.vcxproj
index 27e90d9..9409f6d 100644
--- a/tinyphone-installer/actions/actions.vcxproj
+++ b/tinyphone-installer/actions/actions.vcxproj
@@ -23,13 +23,13 @@
Win32Proj
actions
installer-actions
- 8.1
+ 10.0
DynamicLibrary
true
- v140_xp
+ v142
Unicode
false
@@ -43,14 +43,14 @@
DynamicLibrary
true
- v140
+ v142
Unicode
Dynamic
DynamicLibrary
false
- v140
+ v142
true
Unicode
diff --git a/tinyphone/config.cpp b/tinyphone/config.cpp
index 2d6ec8b..0cc315c 100644
--- a/tinyphone/config.cpp
+++ b/tinyphone/config.cpp
@@ -1,8 +1,8 @@
#include "stdafx.h"
+#include
#include "config.h"
#include "net.h"
#include "utils.h"
-#include
#include "crypt.h"
#ifdef __APPLE__
diff --git a/tinyphone/tinyphone.vcxproj b/tinyphone/tinyphone.vcxproj
index 1d64337..c671a80 100644
--- a/tinyphone/tinyphone.vcxproj
+++ b/tinyphone/tinyphone.vcxproj
@@ -22,13 +22,13 @@
{968AADC8-5E16-44C2-919C-48683EF6729E}
Win32Proj
tinyphone
- 8.1
+ 10.0
Application
true
- v140_xp
+ v142
MultiByte
false
@@ -43,13 +43,13 @@
Application
true
- v140
+ v142
Unicode
Application
false
- v140
+ v142
true
Unicode
@@ -90,14 +90,14 @@
Disabled
WIN32;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
true
- E:\lib\statsd-cpp\include;E:\lib\portaudio\include;..\lib;..\lib\curl\include;..\lib\json\single_include;C:\local\boost_1_68_0;..\lib\crow\include;..\lib\pjproject\pjnath\include;..\lib\pjproject\pjmedia\include;..\lib\pjproject\pjlib-util\include;..\lib\pjproject\pjlib\include;..\lib\pjproject\pjsip\include;%(AdditionalIncludeDirectories)
+ E:\lib\statsd-cpp\include;E:\lib\portaudio\include;..\lib;..\lib\curl\include;..\lib\json\single_include;C:\local\boost_1_74_0;..\lib\crow\include;..\lib\pjproject\pjnath\include;..\lib\pjproject\pjmedia\include;..\lib\pjproject\pjlib-util\include;..\lib\pjproject\pjlib\include;..\lib\pjproject\pjsip\include;%(AdditionalIncludeDirectories)
MultiThreadedDebug
true
Windows
true
- ..\lib\portaudio\build\msvc\Win32\Debug;..\lib\cryptopp\Win32\Output\Debug;..\lib\bcg729\build\src\Debug;..\lib\curl\builds\libcurl-vc-x86-release-dll-ipv6-sspi-winssl\lib;C:\local\boost_1_68_0\lib32-msvc-14.0;..\lib\opus\win32\VS2015\Win32\Debug;..\lib\vp8vfw\vp8\lib\Win32;..\lib\pjproject\pjsip\lib;..\lib\pjproject\pjnath\lib;..\lib\pjproject\pjmedia\lib;..\lib\pjproject\pjlib-util\lib;..\lib\pjproject\pjlib\lib;..\lib\pjproject\lib;%(AdditionalLibraryDirectories)
+ ..\lib\portaudio\build\msvc\Win32\Debug;..\lib\cryptopp\Win32\Output\Debug;..\lib\bcg729\build\src\Debug;..\lib\curl\builds\libcurl-vc-x86-release-dll-ipv6-sspi-winssl\lib;C:\local\boost_1_74_0\lib32-msvc-14.2;..\lib\opus\win32\VS2015\Win32\Debug;..\lib\vp8vfw\vp8\lib\Win32;..\lib\pjproject\pjsip\lib;..\lib\pjproject\pjnath\lib;..\lib\pjproject\pjmedia\lib;..\lib\pjproject\pjlib-util\lib;..\lib\pjproject\pjlib\lib;..\lib\pjproject\lib;%(AdditionalLibraryDirectories)
Wtsapi32.lib;ws2_32.lib;libcurl.lib;version.lib;cryptlib.lib;bcg729.lib;winmm.lib;iphlpapi.lib;portaudio_x86.lib;%(AdditionalDependencies)
false
@@ -133,7 +133,7 @@
true
WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- E:\lib\statsd-cpp\include;E:\lib\portaudio\include;..\lib;..\lib\curl\include;..\lib\json\single_include;C:\local\boost_1_68_0;..\lib\crow\include;..\lib\pjproject\pjnath\include;..\lib\pjproject\pjmedia\include;..\lib\pjproject\pjlib-util\include;..\lib\pjproject\pjlib\include;..\lib\pjproject\pjsip\include;%(AdditionalIncludeDirectories)
+ E:\lib\statsd-cpp\include;E:\lib\portaudio\include;..\lib;..\lib\curl\include;..\lib\json\single_include;C:\local\boost_1_74_0;..\lib\crow\include;..\lib\pjproject\pjnath\include;..\lib\pjproject\pjmedia\include;..\lib\pjproject\pjlib-util\include;..\lib\pjproject\pjlib\include;..\lib\pjproject\pjsip\include;%(AdditionalIncludeDirectories)
true
@@ -141,7 +141,7 @@
true
true
false
- ..\lib\portaudio\build\msvc\Win32\Release;..\lib\cryptopp\Win32\Output\Release;..\lib\bcg729\build\src\Release;..\lib\curl\builds\libcurl-vc-x86-release-dll-ipv6-sspi-winssl\lib;C:\local\boost_1_68_0\lib32-msvc-14.0;..\lib\opus\win32\VS2015\Win32\Debug;..\lib\vp8vfw\vp8\lib\Win32;..\lib\pjproject\pjsip\lib;..\lib\pjproject\pjnath\lib;..\lib\pjproject\pjmedia\lib;..\lib\pjproject\pjlib-util\lib;..\lib\pjproject\pjlib\lib;..\lib\pjproject\lib;%(AdditionalLibraryDirectories)
+ ..\lib\portaudio\build\msvc\Win32\Release;..\lib\cryptopp\Win32\Output\Release;..\lib\bcg729\build\src\Release;..\lib\curl\builds\libcurl-vc-x86-release-dll-ipv6-sspi-winssl\lib;C:\local\boost_1_74_0\lib32-msvc-14.2;..\lib\opus\win32\VS2015\Win32\Debug;..\lib\vp8vfw\vp8\lib\Win32;..\lib\pjproject\pjsip\lib;..\lib\pjproject\pjnath\lib;..\lib\pjproject\pjmedia\lib;..\lib\pjproject\pjlib-util\lib;..\lib\pjproject\pjlib\lib;..\lib\pjproject\lib;%(AdditionalLibraryDirectories)
Wtsapi32.lib;ws2_32.lib;libcurl.lib;version.lib;cryptlib.lib;bcg729.lib;winmm.lib;iphlpapi.lib;portaudio_x86.lib;%(AdditionalDependencies)
false
diff --git a/tinyphone/utils.h b/tinyphone/utils.h
index d5ee6ff..4237477 100644
--- a/tinyphone/utils.h
+++ b/tinyphone/utils.h
@@ -3,11 +3,12 @@
#ifndef UTILS_HEADER_FILE_H
#define UTILS_HEADER_FILE_H
-#ifdef _MSC_VER
-#define snprintf _snprintf
-#define vsnprintf _vsnprintf
-#endif
+//#ifdef _MSC_VER && _MSC_VER < 1500 // VC++ 8.0 and below
+//#define snprintf _snprintf
+//#define vsnprintf _vsnprintf
+//#endif
+#include
#include
#include
#include
@@ -18,8 +19,6 @@
#include
#include "consts.h"
-#include
-
#include
#include