rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into smartzeroconf

This commit is contained in:
walker0643 2018-08-05 13:12:41 -04:00
parent a8d0c1620d a381347233
commit a352683702
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clean_build.bat
View File

@ -3,8 +3,8 @@
REM defaults - override them by creating a build_env.bat file REM defaults - override them by creating a build_env.bat file
set B_BUILD_TYPE=Debug set B_BUILD_TYPE=Debug
set B_QT_ROOT=C:\Qt set B_QT_ROOT=C:\Qt
set B_QT_VER=5.6.3 set B_QT_VER=5.11.1
set B_QT_MSVC=msvc2015_64 set B_QT_MSVC=msvc2017_64
set B_BONJOUR=C:\Program Files\Bonjour SDK set B_BONJOUR=C:\Program Files\Bonjour SDK
set savedir=%cd% set savedir=%cd%

2
cmake/Version.cmake
View File

@ -1,7 +1,7 @@
cmake_minimum_required (VERSION 3.4) cmake_minimum_required (VERSION 3.4)
set (BARRIER_VERSION_MAJOR 2) set (BARRIER_VERSION_MAJOR 2)
set (BARRIER_VERSION_MINOR 1) set (BARRIER_VERSION_MINOR 2)
set (BARRIER_VERSION_PATCH 0) set (BARRIER_VERSION_PATCH 0)
# #