fetch-deps.bat

-@echo off
-setlocal EnableDelayedExpansion
-
-set cloneSubmodules=N
-if "%1" == "/c" (
-    set cloneSubmodules=Y
-)
-
-set WGET_CMD=wget --no-check-certificate --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --tries=4
-set APPLY_CMD=git apply --reject --ignore-whitespace --whitespace=fix
-
-if exist qrencode-win32 (
-    rmdir qrencode-win32 /s /q
-)
-git clone https://github.com/BlueDragon747/qrencode-win32.git
-cd qrencode-win32
-git checkout d6495a2aa74d058d54ae0f1b9e9e545698de66ce
-%APPLY_CMD% ..\qrencode-win32.patch
-
-:cleanup
-endlocal
-@endlocal
-exit /B %ERRORLEVEL%
-
-:getTarballDepToFolder
-%WGET_CMD% %1/archive/%2.tar.gz
-7z -y x %2.tar.gz && 7z -y x %2.tar
-del %2.tar && del %2.tar.gz && del pax_global_header
-if exist %3 (
-    rmdir %3 /s /q
-)
-if exist %3-%2 (
-    rename %3-%2 %3
-) else (
-    rename lib%3-%2 %3
-)
\ No newline at end of file

images/icons/av_icons/delete-24px.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z" fill="white"/><path d="M0 0h24v24H0z" fill="none"/></svg>
\ No newline at end of file

images/icons/av_icons/fiber_manual_record-24px.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M24 24H0V0h24v24z"/><circle fill="#ff0000" cx="12" cy="12" r="8"/></svg>
\ No newline at end of file

images/icons/av_icons/mic-24px.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 14c1.66 0 2.99-1.34 2.99-3L15 5c0-1.66-1.34-3-3-3S9 3.34 9 5v6c0 1.66 1.34 3 3 3zm5.3-3c0 3-2.54 5.1-5.3 5.1S6.7 14 6.7 11H5c0 3.41 2.72 6.23 6 6.72V21h2v-3.28c3.28-.48 6-3.3 6-6.72h-1.7z" fill="white"/><path d="M0 0h24v24H0z" fill="none"/></svg>
\ No newline at end of file

images/icons/av_icons/pause-24px.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z" fill="white"/><path d="M0 0h24v24H0z" fill="none"/></svg>
\ No newline at end of file

images/icons/av_icons/play_circle_outline-24px.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M0 0h24v24H0z" fill="none"/><path d="M10 16.5l6-4.5-6-4.5v9zM12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z" fill="white"/></svg>
\ No newline at end of file

images/icons/av_icons/re-record-24px.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 5V1L7 6l5 5V7c3.31 0 6 2.69 6 6s-2.69 6-6 6-6-2.69-6-6H4c0 4.42 3.58 8 8 8s8-3.58 8-8-3.58-8-8-8z" fill="white"/></svg>
\ No newline at end of file

images/icons/av_icons/send-24px.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M2.01 21L23 12 2.01 3 2 10l15 2-15 2z" fill="white"/><path d="M0 0h24v24H0z" fill="none"/></svg>
\ No newline at end of file

images/icons/av_icons/stop-24px-red.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M0 0h24v24H0z" fill="none"/><path d="M6 6h12v12H6z" fill="#ff0000"/></svg>
\ No newline at end of file

images/icons/av_icons/stop-24px.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M0 0h24v24H0z" fill="none"/><path d="M6 6h12v12H6z" fill="#ffffff"/></svg>
\ No newline at end of file

images/icons/ic_baseline-search-24px.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/><path d="M0 0h24v24H0z" fill="none"/></svg>
\ No newline at end of file

images/icons/info-24px.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z"/></svg>
\ No newline at end of file

invitebuttonswidget.ui

-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>InviteButtonsWidget</class>
- <widget class="QWidget" name="InviteButtonsWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>342</width>
-    <height>120</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>5</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>209</width>
-       <height>17</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <property name="spacing">
-      <number>0</number>
-     </property>
-     <property name="leftMargin">
-      <number>0</number>
-     </property>
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QPushButton" name="btnAcceptInvite">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>30</width>
-         <height>30</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>30</width>
-         <height>30</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Accept</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="ressources.qrc">
-         <normaloff>:/images/icons/ic_person_add_black_24dp_2x.png</normaloff>:/images/icons/ic_person_add_black_24dp_2x.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>18</width>
-         <height>18</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_3">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Fixed</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>8</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnIgnoreInvite">
-       <property name="minimumSize">
-        <size>
-         <width>30</width>
-         <height>30</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>30</width>
-         <height>30</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Refuse</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="ressources.qrc">
-         <normaloff>:/images/icons/ic_clear_24px.svg</normaloff>:/images/icons/ic_clear_24px.svg</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>18</width>
-         <height>18</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_4">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Fixed</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>8</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnBlockInvite">
-       <property name="minimumSize">
-        <size>
-         <width>30</width>
-         <height>30</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>30</width>
-         <height>30</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Block</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="ressources.qrc">
-         <normaloff>:/images/icons/ic_block_24px.svg</normaloff>:/images/icons/ic_block_24px.svg</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>18</width>
-         <height>18</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <spacer name="horizontalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>12</width>
-       <height>17</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="ressources.qrc"/>
- </resources>
- <connections/>
-</ui>

jami-qt.pro

-TEMPLATE = app
+win32-msvc {
+    TARGET = Jami
+    TEMPLATE = vcapp
+
+    QT += core winextras qml quickcontrols2 quick quickwidgets widgets xml multimedia multimediawidgets network webenginewidgets svg sql
+
+    CONFIG += suppress_vcproj_warnings c++17 qtquickcompiler
+
+    QTQUICK_COMPILER_SKIPPED_RESOURCES += ./ressources.qrc
+
+    # compiler options
+    QMAKE_CXXFLAGS += /wd"4068" /wd"4099" /wd"4189" /wd"4267" /wd"4577" /wd"4467" /wd"4715" /wd"4828"
+    QMAKE_CXXFLAGS += /MP /GS /W3 /Gy /Zc:wchar_t /Zi /Gm- /O2 /Zc:inline /fp:precise /errorReport:prompt
+    QMAKE_CXXFLAGS += /Gd /Oi /MD /std:c++17 /FC /EHsc /nologo /sdl
+
+    # linker options
+    QMAKE_LFLAGS+= /ignore:4006,4049,4078,4098 /FORCE:MULTIPLE /INCREMENTAL:NO /Debug /LTCG /NODEFAULTLIB:LIBCMT
+
+    # preprocessor defines
+    DEFINES += UNICODE QT_NO_DEBUG NDEBUG
+
+    # dependencies
+    LRC= ../lrc
+    DRING= ../daemon
+    QRENCODE= qrencode-win32/qrencode-win32
+
+    # client deps
+    INCLUDEPATH += $${QRENCODE}
+    LIBS += $${QRENCODE}/vc8/qrcodelib/x64/Release-Lib/qrcodelib.lib
+
+    # lrc
+    INCLUDEPATH += $${LRC}/src/
+    LIBS += $${LRC}/msvc/release/ringclient_static.lib
+    LIBS += $${LRC}/msvc/src/qtwrapper/Release/qtwrapper.lib
+
+    # daemon
+    INCLUDEPATH += ../daemon/contrib/msvc/include/
+    LIBS += $${DRING}/build-local/x64/ReleaseLib_win32/bin/dring.lib
+    LIBS += $${DRING}/contrib/msvc/lib/x64/libgnutls.lib
+
+    # windows system libs
+    LIBS += Shell32.lib Ole32.lib Advapi32.lib Shlwapi.lib User32.lib Gdi32.lib Crypt32.lib Strmiids.lib
+
+    # output paths
+    OBJECTS_DIR = obj/.obj
+    MOC_DIR = obj/.moc
+    RCC_DIR = obj/.rcc
+    UI_DIR = obj/.ui
+
+    # ReleaseCompile config
+    contains(CONFIG, ReleaseCompile) {
+        CONFIG(ReleaseCompile) {
+            message(ReleaseCompile config enabled)
+            Release: DEFINES += COMPILE_ONLY
+        }
+    }
+
+    # beta config
+    contains(CONFIG, Beta) {
+        CONFIG(Beta) {
+            message(Beta config enabled)
+            Release: DESTDIR = x64/Beta
+            Release: DEFINES += BETA
+        }
+    } else {
+        Release: DESTDIR = x64/Release
+    }
+    Debug: DESTDIR = x64/Debug
+
+    # qt dir
+    QMAKE_INCDIR_QT=$(QTDIR)\include
+    QMAKE_LIBDIR=$(QTDIR)\lib
+    QMAKE_MOC=$(QTDIR)\bin\moc.exe
+    QMAKE_QMAKE=$(QTDIR)\bin\qmake.exe
+
+    # exe icons
+    Release: RC_FILE = ico.rc
+}
+
+unix {
     TARGET = jami-qt
+    TEMPLATE = app
+
+    QT += quick quickwidgets widgets xml multimedia multimediawidgets network webenginewidgets svg quickcontrols2
 
-QT += widgets xml multimedia multimediawidgets network webenginewidgets
+    #check Qt version
+    QT_VERSION = $$[QT_VERSION]
+    QT_VERSION = $$split(QT_VERSION, ".")
+    QT_VER_MAJ = $$member(QT_VERSION, 0)
+    QT_VER_MIN = $$member(QT_VERSION, 1)
 
-isEmpty(LRC) {
-    LRC=../../install/lrc/
+    lessThan(QT_VER_MIN, 12) {
+        QMAKE_CXXFLAGS += -std=c++17
     }
+    greaterThan(QT_VER_MIN, 12) | equals(QT_VER_MIN, 12) {
+        CONFIG += c++17
+    }
+
+    isEmpty(LRC) { LRC=../../install/lrc/ }
 
     INCLUDEPATH += $${LRC}/include/libringclient
     INCLUDEPATH += $${LRC}/include
+    INCLUDEPATH += ../src
 
     LIBS += -L$${LRC}/lib -lringclient
     LIBS += -lqrencode
+}
+
+
 
 # Input
-HEADERS += ./pixbufmanipulator.h \
-    ./ringthemeutils.h \
-    ./runguard.h \
-    ./settingskey.h \
-    ./utils.h \
-    ./version.h \
-    ./webchathelpers.h \
-    ./windowscontactbackend.h \
-    ./aboutdialog.h \
-    ./callwidget.h \
-    ./accountlistmodel.h \
-    ./accountitemdelegate.h \
-    ./deleteaccountdialog.h \
-    ./globalsystemtray.h \
-    ./idlabel.h \
-    ./mainwindow.h \
-    ./navwidget.h \
-    ./photoboothwidget.h \
-    ./invitebuttonswidget.h \
-    ./currentaccountcombobox.h \
-    ./animationhelpers.h \
-    ./advancedsettingswidget.h \
-    ./avatargraphicsview.h \
-    ./bannedlistmodel.h \
-    ./linkdevicedialog.h \
-    ./bezierconnectorwidget.h \
-    ./lrcinstance.h \
-    ./messagewebview.h \
-    ./messagewebpage.h \
-    ./passworddialog.h \
-    ./newwizardwidget.h \
-    ./advancedsipsettingwidget.h \
-    ./iconbutton.h \
-    ./deviceitemwidget.h \
-    ./banneditemwidget.h \
-    ./ringbutton.h \
-    ./ringcontactlineedit.h \
-    ./nameregistrationdialog.h \
-    ./selectareadialog.h \
-    ./smartlistview.h \
-    ./conversationitemdelegate.h \
-    ./smartlistmodel.h \
-    ./conversationsfilterwidget.h \
-    ./smartlistselectorbuttonnotifier.h \
-    ./settingswidget.h \
-    ./toggleswitch.h \
-    ./videooverlay.h \
-    ./videoview.h \
-    ./videowidget.h \
-    ./downloadbar.h \
-    ./updateconfirmdialog.h \
-    ./downloadmanger.h
-SOURCES += ./advancedsettingswidget.cpp \
-    ./advancedsipsettingwidget.cpp \
-    ./avatargraphicsview.cpp \
-    ./banneditemwidget.cpp \
-    ./bannedlistmodel.cpp \
-    ./animationhelpers.cpp \
-    ./currentaccountcombobox.cpp \
-    ./aboutdialog.cpp \
-    ./accountitemdelegate.cpp \
-    ./accountlistmodel.cpp \
-    ./callwidget.cpp \
-    ./deleteaccountdialog.cpp \
-    ./deviceitemwidget.cpp \
-    ./globalsystemtray.cpp \
-    ./iconbutton.cpp \
-    ./idlabel.cpp \
-    ./bezierconnectorwidget.cpp \
-    ./invitebuttonswidget.cpp \
-    ./linkdevicedialog.cpp \
-    ./main.cpp \
-    ./mainwindow.cpp \
-    ./messagewebpage.cpp \
-    ./messagewebview.cpp \
-    ./navwidget.cpp \
-    ./newwizardwidget.cpp \
-    ./passworddialog.cpp \
-    ./photoboothwidget.cpp \
-    ./pixbufmanipulator.cpp \
-    ./nameregistrationdialog.cpp \
-    ./ringbutton.cpp \
-    ./ringcontactlineedit.cpp \
-    ./runguard.cpp \
-    ./selectareadialog.cpp \
-    ./conversationsfilterwidget.cpp \
-    ./settingswidget.cpp \
-    ./smartlistselectorbuttonnotifier.cpp \
-    ./smartlistview.cpp \
-    ./conversationitemdelegate.cpp \
-    ./smartlistmodel.cpp \
-    ./toggleswitch.cpp \
-    ./utils.cpp \
-    ./videooverlay.cpp \
-    ./videoview.cpp \
-    ./videowidget.cpp \
-    ./webchathelpers.cpp \
-    ./windowscontactbackend.cpp \
-    ./downloadbar.cpp \
-    ./updateconfirmdialog.cpp \
-    ./downloadmanger.cpp
-FORMS += ./aboutdialog.ui \
-    ./advancedsettingswidget.ui \
-    ./advancedsipsettingwidget.ui \
-    ./animatedoverlay.ui \
-    ./banneditemwidget.ui \
-    ./callwidget.ui \
-    ./deleteaccountdialog.ui \
-    ./deviceitemwidget.ui \
-    ./invitebuttonswidget.ui \
-    ./linkdevicedialog.ui \
-    ./mainwindow.ui \
-    ./nameregistrationdialog.ui \
-    ./newwizardwidget.ui \
-    ./passworddialog.ui \
-    ./photoboothdialog.ui \
-    ./photoboothwidget.ui \
-    ./ringbutton.ui \
-    ./settingswidget.ui \
-    ./videooverlay.ui \
-    ./videoview.ui \
-    ./downloadbar.ui \
-    ./updateconfirmdialog.ui \
-    ./contactpicker.ui
-RESOURCES += ressources.qrc
+HEADERS += ./src/aboutdialog.h \
+        ./src/banneditemwidget.h \
+        ./src/conversationsfilterwidget.h \
+        ./src/idlabel.h \
+        ./src/messagewebview.h \
+        ./src/ringbutton.h \
+        ./src/smartlistmodel.h \
+        ./src/utils.h \
+        ./src/accountitemdelegate.h \
+        ./src/bannedlistmodel.h \
+        ./src/currentaccountcombobox.h \
+        ./src/nameregistrationdialog.h \
+        ./src/ringcontactlineedit.h \
+        ./src/smartlistselectorbuttonnotifier.h \
+        ./src/version.h \
+        ./src/accountlistmodel.h \
+        ./src/bezierconnectorwidget.h \
+        ./src/deleteaccountdialog.h \
+        ./src/levelmeter.h \
+        ./src/navwidget.h \
+        ./src/ringthemeutils.h \
+        ./src/smartlistview.h \
+        ./src/videooverlay.h \
+        ./src/advancedsettingswidget.h \
+        ./src/callwidget.h \
+        ./src/deviceitemwidget.h \
+        ./src/linkdevicedialog.h \
+        ./src/newwizardwidget.h \
+        ./src/runguard.h \
+        ./src/splashscreen.h \
+        ./src/videoview.h \
+        ./src/advancedsipsettingwidget.h \
+        ./src/contactpicker.h \
+        ./src/lrcinstance.h \
+        ./src/passworddialog.h \
+        ./src/selectareadialog.h \
+        ./src/toggleswitch.h \
+        ./src/animationhelpers.h \
+        ./src/contactpickeritemdelegate.h \
+        ./src/globalsystemtray.h \
+        ./src/mainwindow.h \
+        ./src/photoboothwidget.h \
+        ./src/settingskey.h \
+        ./src/updateconfirmdialog.h \
+        ./src/webchathelpers.h \
+        ./src/conversationitemdelegate.h \
+        ./src/iconbutton.h \
+        ./src/messagewebpage.h \
+        ./src/pixbufmanipulator.h \
+        ./src/settingswidget.h \
+        ./src/updatedownloaddialog.h \
+        ./src/sipinputpanel.h \
+        ./src/callaudioonlyavataroverlay.h \
+        ./src/overlaybutton.h \
+        ./src/accountmigrationdialog.h \
+        ./src/previewwidget.h \
+        ./src/rendermanager.h \
+        ./src/distantwidget.h \
+        ./src/videowidgetbase.h \
+        ./src/section.h \
+        ./src/collapsiblepasswordwidget.h \
+        ./src/notifypushbutton.h \
+        ./src/popupdialog.h \
+        ./src/recordoverlay.h \
+        ./src/widgethelpers.h \
+        ./src/recordwidget.h \
+        ./src/networkmanager.h \
+        ./src/connectivitymonitor.h \
+        ./src/userprofile.h \
+        ./src/qmlclipboardadapter.h \
+        ./src/mainapplication.h
+SOURCES += ./src/aboutdialog.cpp \
+        ./src/banneditemwidget.cpp \
+        ./src/conversationsfilterwidget.cpp \
+        ./src/idlabel.cpp \
+        ./src/messagewebview.cpp \
+        ./src/ringbutton.cpp \
+        ./src/smartlistview.cpp \
+        ./src/videoview.cpp \
+        ./src/accountitemdelegate.cpp \
+        ./src/bannedlistmodel.cpp \
+        ./src/currentaccountcombobox.cpp \
+        ./src/nameregistrationdialog.cpp \
+        ./src/ringcontactlineedit.cpp \
+        ./src/splashscreen.cpp \
+        ./src/accountlistmodel.cpp \
+        ./src/bezierconnectorwidget.cpp \
+        ./src/deleteaccountdialog.cpp \
+        ./src/levelmeter.cpp \
+        ./src/navwidget.cpp \
+        ./src/runguard.cpp \
+        ./src/toggleswitch.cpp \
+        ./src/webchathelpers.cpp \
+        ./src/advancedsettingswidget.cpp \
+        ./src/callwidget.cpp \
+        ./src/deviceitemwidget.cpp \
+        ./src/linkdevicedialog.cpp \
+        ./src/newwizardwidget.cpp \
+        ./src/selectareadialog.cpp \
+        ./src/updateconfirmdialog.cpp \
+        ./src/advancedsipsettingwidget.cpp \
+        ./src/contactpicker.cpp \
+        ./src/main.cpp \
+        ./src/passworddialog.cpp \
+        ./src/settingswidget.cpp \
+        ./src/updatedownloaddialog.cpp \
+        ./src/animationhelpers.cpp \
+        ./src/contactpickeritemdelegate.cpp \
+        ./src/globalsystemtray.cpp \
+        ./src/mainwindow.cpp \
+        ./src/photoboothwidget.cpp \
+        ./src/smartlistmodel.cpp \
+        ./src/utils.cpp \
+        ./src/conversationitemdelegate.cpp \
+        ./src/iconbutton.cpp \
+        ./src/messagewebpage.cpp \
+        ./src/pixbufmanipulator.cpp \
+        ./src/smartlistselectorbuttonnotifier.cpp \
+        ./src/videooverlay.cpp \
+        ./src/sipinputpanel.cpp \
+        ./src/callaudioonlyavataroverlay.cpp \
+        ./src/overlaybutton.cpp \
+        ./src/accountmigrationdialog.cpp \
+        ./src/previewwidget.cpp \
+        ./src/rendermanager.cpp \
+        ./src/distantwidget.cpp \
+        ./src/videowidgetbase.cpp \
+        ./src/section.cpp \
+        ./src/collapsiblepasswordwidget.cpp \
+        ./src/notifypushbutton.cpp \
+        ./src/popupdialog.cpp \
+        ./src/recordoverlay.cpp \
+        ./src/widgethelpers.cpp \
+        ./src/recordwidget.cpp \
+        ./src/networkmanager.cpp \
+        ./src/connectivitymonitor.cpp \
+        ./src/userprofile.cpp \
+        ./src/mainapplication.cpp
+FORMS += ./src/aboutdialog.ui \
+        ./src/advancedsipsettingwidget.ui \
+        ./src/callwidget.ui \
+        ./src/deviceitemwidget.ui \
+        ./src/mainwindow.ui \
+        ./src/passworddialog.ui \
+        ./src/ringbutton.ui \
+        ./src/updatedownloaddialog.ui \
+        ./src/contactpicker.ui \
+        ./src/nameregistrationdialog.ui \
+        ./src/settingswidget.ui \
+        ./src/videooverlay.ui \
+        ./src/advancedsettingswidget.ui \
+        ./src/banneditemwidget.ui \
+        ./src/deleteaccountdialog.ui \
+        ./src/linkdevicedialog.ui \
+        ./src/newwizardwidget.ui \
+        ./src/photoboothwidget.ui \
+        ./src/updateconfirmdialog.ui \
+        ./src/videoview.ui \
+        ./src/sipkeypad.ui \
+        ./src/callaudioonlyavataroverlay.ui \
+        ./src/accountmigration.ui \
+        ./src/section.ui \
+        ./src/collapsiblepasswordwidget.ui \
+        ./src/popupdialog.ui \
+        ./src/recordoverlay.ui \
+        ./src/recordwidget.ui
+RESOURCES += ./ressources.qrc \
+             ./qml.qrc

ring-client-windows.sln → jami-qt.sln

-
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2026
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29613.14
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ring-client-windows", "ring-client-windows.vcxproj", "{0F6318E4-4C06-384E-BCA8-F344DA187957}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A604BA33-C1DB-34F6-8584-C429857717A8} = {A604BA33-C1DB-34F6-8584-C429857717A8}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ring-daemon", "..\daemon\MSVC\ring-daemon.vcxproj", "{79F8DE42-595D-49D9-A66F-55244FD9DCC3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ring-daemon", "..\daemon\build-local\ring-daemon.vcxproj", "{1CA4822C-F599-3879-A78F-332D823E4871}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031}
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}
@@ -17,16 +11,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ring-daemon", "..\daemon\MS
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}
+		{711397CE-E5D5-467D-9457-8716C047E50C} = {711397CE-E5D5-467D-9457-8716C047E50C}
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21}
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8}
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ringclient_static", "..\lrc\msvc\ringclient_static.vcxproj", "{A604BA33-C1DB-34F6-8584-C429857717A8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ringclient_static", "..\lrc\msvc\ringclient_static.vcxproj", "{774F1C61-6659-36E6-9519-17A753890576}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qtwrapper", "..\lrc\msvc\src\qtwrapper\qtwrapper.vcxproj", "{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qtwrapper", "..\lrc\msvc\src\qtwrapper\qtwrapper.vcxproj", "{2CFF20AA-9341-3564-A044-C38E70D5372A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3} = {79F8DE42-595D-49D9-A66F-55244FD9DCC3}
+		{1CA4822C-F599-3879-A78F-332D823E4871} = {1CA4822C-F599-3879-A78F-332D823E4871}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "JamiInstaller", "JamiInstaller\JamiInstaller.wixproj", "{DBBFBC55-1C20-4D21-AE3B-6E8B14C4FE48}"
@@ -61,8 +56,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{1ECB5B
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "contrib", "contrib", "{B4FD804C-ABD9-4F54-858B-911F0119580C}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opendht", "..\daemon\contrib\build\opendht\MSVC\opendht.vcxproj", "{711397CE-E5D5-467D-9457-8716C047E50C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jami-qt", "jami-qt.vcxproj", "{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}"
+	ProjectSection(ProjectDependencies) = postProject
+		{774F1C61-6659-36E6-9519-17A753890576} = {774F1C61-6659-36E6-9519-17A753890576}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Beta|Any CPU = Beta|Any CPU
+		Beta|x64 = Beta|x64
+		Beta|x86 = Beta|x86
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
@@ -77,91 +85,110 @@ Global
 		ReleaseLib|x86 = ReleaseLib|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0F6318E4-4C06-384E-BCA8-F344DA187957}.Release|Any CPU.ActiveCfg = Release|x64
-		{0F6318E4-4C06-384E-BCA8-F344DA187957}.Release|x64.ActiveCfg = Release|x64
-		{0F6318E4-4C06-384E-BCA8-F344DA187957}.Release|x64.Build.0 = Release|x64
-		{0F6318E4-4C06-384E-BCA8-F344DA187957}.Release|x86.ActiveCfg = Release|x64
-		{0F6318E4-4C06-384E-BCA8-F344DA187957}.ReleaseCompile|Any CPU.ActiveCfg = ReleaseCompile|x64
-		{0F6318E4-4C06-384E-BCA8-F344DA187957}.ReleaseCompile|x64.ActiveCfg = ReleaseCompile|x64
-		{0F6318E4-4C06-384E-BCA8-F344DA187957}.ReleaseCompile|x64.Build.0 = ReleaseCompile|x64
-		{0F6318E4-4C06-384E-BCA8-F344DA187957}.ReleaseCompile|x86.ActiveCfg = ReleaseCompile|x64
-		{0F6318E4-4C06-384E-BCA8-F344DA187957}.ReleaseLib_win32|Any CPU.ActiveCfg = ReleaseCompile|x64
-		{0F6318E4-4C06-384E-BCA8-F344DA187957}.ReleaseLib_win32|Any CPU.Build.0 = ReleaseCompile|x64
-		{0F6318E4-4C06-384E-BCA8-F344DA187957}.ReleaseLib_win32|x64.ActiveCfg = Release|x64
-		{0F6318E4-4C06-384E-BCA8-F344DA187957}.ReleaseLib_win32|x64.Build.0 = Release|x64
-		{0F6318E4-4C06-384E-BCA8-F344DA187957}.ReleaseLib_win32|x86.ActiveCfg = Release|x64
-		{0F6318E4-4C06-384E-BCA8-F344DA187957}.ReleaseLib_win32|x86.Build.0 = Release|x64
-		{0F6318E4-4C06-384E-BCA8-F344DA187957}.ReleaseLib|Any CPU.ActiveCfg = ReleaseCompile|x64
-		{0F6318E4-4C06-384E-BCA8-F344DA187957}.ReleaseLib|Any CPU.Build.0 = ReleaseCompile|x64
-		{0F6318E4-4C06-384E-BCA8-F344DA187957}.ReleaseLib|x64.ActiveCfg = Release|x64
-		{0F6318E4-4C06-384E-BCA8-F344DA187957}.ReleaseLib|x64.Build.0 = Release|x64
-		{0F6318E4-4C06-384E-BCA8-F344DA187957}.ReleaseLib|x86.ActiveCfg = Release|x64
-		{0F6318E4-4C06-384E-BCA8-F344DA187957}.ReleaseLib|x86.Build.0 = Release|x64
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Release|Any CPU.ActiveCfg = Release|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Release|x64.ActiveCfg = ReleaseLib_win32|x64
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Release|x64.Build.0 = ReleaseLib_win32|x64
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Release|x86.ActiveCfg = Release|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Release|x86.Build.0 = Release|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseCompile|Any CPU.ActiveCfg = Release|x64
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseCompile|Any CPU.Build.0 = Release|x64
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseCompile|x64.ActiveCfg = ReleaseLib|x64
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseCompile|x64.Build.0 = ReleaseLib|x64
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseCompile|x86.ActiveCfg = ReleaseLib|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseCompile|x86.Build.0 = ReleaseLib|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib_win32|Any CPU.ActiveCfg = ReleaseLib_win32|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib_win32|x64.ActiveCfg = ReleaseLib_win32|x64
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib_win32|x64.Build.0 = ReleaseLib_win32|x64
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib_win32|x86.ActiveCfg = ReleaseLib|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib_win32|x86.Build.0 = ReleaseLib|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib|Any CPU.ActiveCfg = ReleaseLib|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib|x64.ActiveCfg = ReleaseLib_win32|x64
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib|x64.Build.0 = ReleaseLib_win32|x64
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib|x86.ActiveCfg = ReleaseLib|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib|x86.Build.0 = ReleaseLib|Win32
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.Release|Any CPU.ActiveCfg = Release|x64
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.Release|x64.ActiveCfg = Release|x64
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.Release|x64.Build.0 = Release|x64
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.Release|x86.ActiveCfg = Release|x64
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.ReleaseCompile|Any CPU.ActiveCfg = Release|x64
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.ReleaseCompile|Any CPU.Build.0 = Release|x64
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.ReleaseCompile|x64.ActiveCfg = Release|x64
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.ReleaseCompile|x64.Build.0 = Release|x64
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.ReleaseCompile|x86.ActiveCfg = Release|x64
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.ReleaseCompile|x86.Build.0 = Release|x64
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.ReleaseLib_win32|Any CPU.ActiveCfg = RelWithDebInfo|x64
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.ReleaseLib_win32|Any CPU.Build.0 = RelWithDebInfo|x64
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.ReleaseLib_win32|x64.ActiveCfg = Release|x64
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.ReleaseLib_win32|x64.Build.0 = Release|x64
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.ReleaseLib_win32|x86.ActiveCfg = RelWithDebInfo|x64
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.ReleaseLib_win32|x86.Build.0 = RelWithDebInfo|x64
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.ReleaseLib|Any CPU.ActiveCfg = RelWithDebInfo|x64
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.ReleaseLib|Any CPU.Build.0 = RelWithDebInfo|x64
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.ReleaseLib|x64.ActiveCfg = Release|x64
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.ReleaseLib|x64.Build.0 = Release|x64
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.ReleaseLib|x86.ActiveCfg = MinSizeRel|x64
-		{A604BA33-C1DB-34F6-8584-C429857717A8}.ReleaseLib|x86.Build.0 = MinSizeRel|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.Release|Any CPU.ActiveCfg = Release|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.Release|x64.ActiveCfg = Release|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.Release|x64.Build.0 = Release|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.Release|x86.ActiveCfg = Release|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.ReleaseCompile|Any CPU.ActiveCfg = Release|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.ReleaseCompile|Any CPU.Build.0 = Release|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.ReleaseCompile|x64.ActiveCfg = Release|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.ReleaseCompile|x64.Build.0 = Release|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.ReleaseCompile|x86.ActiveCfg = Release|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.ReleaseCompile|x86.Build.0 = Release|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.ReleaseLib_win32|Any CPU.ActiveCfg = RelWithDebInfo|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.ReleaseLib_win32|Any CPU.Build.0 = RelWithDebInfo|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.ReleaseLib_win32|x64.ActiveCfg = Release|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.ReleaseLib_win32|x64.Build.0 = Release|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.ReleaseLib_win32|x86.ActiveCfg = RelWithDebInfo|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.ReleaseLib_win32|x86.Build.0 = RelWithDebInfo|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.ReleaseLib|Any CPU.ActiveCfg = RelWithDebInfo|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.ReleaseLib|Any CPU.Build.0 = RelWithDebInfo|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.ReleaseLib|x64.ActiveCfg = Release|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.ReleaseLib|x64.Build.0 = Release|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.ReleaseLib|x86.ActiveCfg = MinSizeRel|x64
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E}.ReleaseLib|x86.Build.0 = MinSizeRel|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.Beta|Any CPU.ActiveCfg = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.Beta|Any CPU.Build.0 = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.Beta|x64.ActiveCfg = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.Beta|x64.Build.0 = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.Beta|x86.ActiveCfg = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.Beta|x86.Build.0 = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.Debug|Any CPU.ActiveCfg = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.Debug|Any CPU.Build.0 = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.Debug|x64.ActiveCfg = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.Debug|x64.Build.0 = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.Debug|x86.ActiveCfg = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.Debug|x86.Build.0 = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.Release|Any CPU.ActiveCfg = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.Release|Any CPU.Build.0 = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.Release|x64.ActiveCfg = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.Release|x64.Build.0 = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.Release|x86.ActiveCfg = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.Release|x86.Build.0 = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.ReleaseCompile|Any CPU.ActiveCfg = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.ReleaseCompile|Any CPU.Build.0 = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.ReleaseCompile|x64.ActiveCfg = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.ReleaseCompile|x64.Build.0 = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.ReleaseCompile|x86.ActiveCfg = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.ReleaseCompile|x86.Build.0 = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.ReleaseLib_win32|Any CPU.ActiveCfg = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.ReleaseLib_win32|x64.ActiveCfg = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.ReleaseLib_win32|x64.Build.0 = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.ReleaseLib_win32|x86.ActiveCfg = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.ReleaseLib|Any CPU.ActiveCfg = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.ReleaseLib|Any CPU.Build.0 = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.ReleaseLib|x64.ActiveCfg = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.ReleaseLib|x64.Build.0 = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.ReleaseLib|x86.ActiveCfg = ReleaseLib_win32|x64
+		{1CA4822C-F599-3879-A78F-332D823E4871}.ReleaseLib|x86.Build.0 = ReleaseLib_win32|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.Beta|Any CPU.ActiveCfg = Release|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.Beta|x64.ActiveCfg = Release|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.Beta|x64.Build.0 = Release|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.Beta|x86.ActiveCfg = Release|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.Debug|x64.ActiveCfg = Debug|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.Debug|x64.Build.0 = Debug|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.Debug|x86.ActiveCfg = Debug|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.Release|Any CPU.ActiveCfg = Release|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.Release|x64.ActiveCfg = Release|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.Release|x64.Build.0 = Release|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.Release|x86.ActiveCfg = Release|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.ReleaseCompile|Any CPU.ActiveCfg = Release|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.ReleaseCompile|Any CPU.Build.0 = Release|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.ReleaseCompile|x64.ActiveCfg = Release|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.ReleaseCompile|x64.Build.0 = Release|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.ReleaseCompile|x86.ActiveCfg = Release|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.ReleaseCompile|x86.Build.0 = Release|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.ReleaseLib_win32|Any CPU.ActiveCfg = RelWithDebInfo|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.ReleaseLib_win32|Any CPU.Build.0 = RelWithDebInfo|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.ReleaseLib_win32|x64.ActiveCfg = Release|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.ReleaseLib_win32|x64.Build.0 = Release|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.ReleaseLib_win32|x86.ActiveCfg = RelWithDebInfo|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.ReleaseLib_win32|x86.Build.0 = RelWithDebInfo|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.ReleaseLib|Any CPU.ActiveCfg = RelWithDebInfo|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.ReleaseLib|Any CPU.Build.0 = RelWithDebInfo|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.ReleaseLib|x64.ActiveCfg = Release|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.ReleaseLib|x64.Build.0 = Release|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.ReleaseLib|x86.ActiveCfg = MinSizeRel|x64
+		{774F1C61-6659-36E6-9519-17A753890576}.ReleaseLib|x86.Build.0 = MinSizeRel|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.Beta|Any CPU.ActiveCfg = Release|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.Beta|x64.ActiveCfg = Release|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.Beta|x64.Build.0 = Release|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.Beta|x86.ActiveCfg = Release|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.Debug|x64.ActiveCfg = Debug|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.Debug|x64.Build.0 = Debug|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.Debug|x86.ActiveCfg = Debug|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.Release|Any CPU.ActiveCfg = Release|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.Release|x64.ActiveCfg = Release|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.Release|x64.Build.0 = Release|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.Release|x86.ActiveCfg = Release|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.ReleaseCompile|Any CPU.ActiveCfg = Release|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.ReleaseCompile|Any CPU.Build.0 = Release|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.ReleaseCompile|x64.ActiveCfg = Release|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.ReleaseCompile|x64.Build.0 = Release|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.ReleaseCompile|x86.ActiveCfg = Release|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.ReleaseCompile|x86.Build.0 = Release|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.ReleaseLib_win32|Any CPU.ActiveCfg = RelWithDebInfo|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.ReleaseLib_win32|Any CPU.Build.0 = RelWithDebInfo|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.ReleaseLib_win32|x64.ActiveCfg = Release|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.ReleaseLib_win32|x64.Build.0 = Release|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.ReleaseLib_win32|x86.ActiveCfg = RelWithDebInfo|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.ReleaseLib_win32|x86.Build.0 = RelWithDebInfo|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.ReleaseLib|Any CPU.ActiveCfg = RelWithDebInfo|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.ReleaseLib|Any CPU.Build.0 = RelWithDebInfo|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.ReleaseLib|x64.ActiveCfg = Release|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.ReleaseLib|x64.Build.0 = Release|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.ReleaseLib|x86.ActiveCfg = MinSizeRel|x64
+		{2CFF20AA-9341-3564-A044-C38E70D5372A}.ReleaseLib|x86.Build.0 = MinSizeRel|x64
+		{DBBFBC55-1C20-4D21-AE3B-6E8B14C4FE48}.Beta|Any CPU.ActiveCfg = Release|x64
+		{DBBFBC55-1C20-4D21-AE3B-6E8B14C4FE48}.Beta|x64.ActiveCfg = Beta|x64
+		{DBBFBC55-1C20-4D21-AE3B-6E8B14C4FE48}.Beta|x64.Build.0 = Beta|x64
+		{DBBFBC55-1C20-4D21-AE3B-6E8B14C4FE48}.Beta|x86.ActiveCfg = Release|x64
+		{DBBFBC55-1C20-4D21-AE3B-6E8B14C4FE48}.Debug|Any CPU.ActiveCfg = Beta|x64
+		{DBBFBC55-1C20-4D21-AE3B-6E8B14C4FE48}.Debug|Any CPU.Build.0 = Beta|x64
+		{DBBFBC55-1C20-4D21-AE3B-6E8B14C4FE48}.Debug|x64.ActiveCfg = Beta|x64
+		{DBBFBC55-1C20-4D21-AE3B-6E8B14C4FE48}.Debug|x64.Build.0 = Beta|x64
+		{DBBFBC55-1C20-4D21-AE3B-6E8B14C4FE48}.Debug|x86.ActiveCfg = Beta|x64
+		{DBBFBC55-1C20-4D21-AE3B-6E8B14C4FE48}.Debug|x86.Build.0 = Beta|x64
 		{DBBFBC55-1C20-4D21-AE3B-6E8B14C4FE48}.Release|Any CPU.ActiveCfg = Release|x64
 		{DBBFBC55-1C20-4D21-AE3B-6E8B14C4FE48}.Release|x64.ActiveCfg = Release|x64
 		{DBBFBC55-1C20-4D21-AE3B-6E8B14C4FE48}.Release|x64.Build.0 = Release|x64
@@ -184,6 +211,16 @@ Global
 		{DBBFBC55-1C20-4D21-AE3B-6E8B14C4FE48}.ReleaseLib|x64.Build.0 = Release|x64
 		{DBBFBC55-1C20-4D21-AE3B-6E8B14C4FE48}.ReleaseLib|x86.ActiveCfg = Release|x64
 		{DBBFBC55-1C20-4D21-AE3B-6E8B14C4FE48}.ReleaseLib|x86.Build.0 = Release|x64
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Beta|Any CPU.ActiveCfg = Release|Win32
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Beta|x64.ActiveCfg = Release|x64
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Beta|x64.Build.0 = Release|x64
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Beta|x86.ActiveCfg = Release|Win32
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Beta|x86.Build.0 = Release|Win32
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug|x64.ActiveCfg = Debug|x64
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug|x64.Build.0 = Debug|x64
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug|x86.ActiveCfg = Debug|Win32
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug|x86.Build.0 = Debug|Win32
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release|Any CPU.ActiveCfg = Release|Win32
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release|x64.ActiveCfg = Release|x64
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release|x64.Build.0 = Release|x64
@@ -207,6 +244,16 @@ Global
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.ReleaseLib|x64.Build.0 = Release|x64
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.ReleaseLib|x86.ActiveCfg = Release-Static|Win32
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.ReleaseLib|x86.Build.0 = Release-Static|Win32
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Beta|Any CPU.ActiveCfg = Release|Win32
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Beta|x64.ActiveCfg = Release|x64
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Beta|x64.Build.0 = Release|x64
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Beta|x86.ActiveCfg = Release|Win32
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Beta|x86.Build.0 = Release|Win32
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug|x64.ActiveCfg = Debug|x64
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug|x64.Build.0 = Debug|x64
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug|x86.ActiveCfg = Debug|Win32
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug|x86.Build.0 = Debug|Win32
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release|Any CPU.ActiveCfg = Release|Win32
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release|x64.ActiveCfg = Release|x64
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release|x64.Build.0 = Release|x64
@@ -230,6 +277,16 @@ Global
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.ReleaseLib|x64.Build.0 = Release|x64
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.ReleaseLib|x86.ActiveCfg = Release-Static|Win32
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.ReleaseLib|x86.Build.0 = Release-Static|Win32
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Beta|Any CPU.ActiveCfg = Release|Win32
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Beta|x64.ActiveCfg = Release|x64
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Beta|x64.Build.0 = Release|x64
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Beta|x86.ActiveCfg = Release|Win32
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Beta|x86.Build.0 = Release|Win32
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug|x64.ActiveCfg = Debug|x64
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug|x64.Build.0 = Debug|x64
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug|x86.ActiveCfg = Debug|Win32
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug|x86.Build.0 = Debug|Win32
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release|Any CPU.ActiveCfg = Release|Win32
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release|x64.ActiveCfg = Release|x64
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release|x64.Build.0 = Release|x64
@@ -253,6 +310,16 @@ Global
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.ReleaseLib|x64.Build.0 = Release|x64
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.ReleaseLib|x86.ActiveCfg = Release-Static|Win32
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.ReleaseLib|x86.Build.0 = Release-Static|Win32
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Beta|Any CPU.ActiveCfg = Release|Win32
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Beta|x64.ActiveCfg = Release|x64
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Beta|x64.Build.0 = Release|x64
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Beta|x86.ActiveCfg = Release|Win32
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Beta|x86.Build.0 = Release|Win32
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug|x64.ActiveCfg = Debug|x64
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug|x64.Build.0 = Debug|x64
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug|x86.ActiveCfg = Debug|Win32
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug|x86.Build.0 = Debug|Win32
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release|Any CPU.ActiveCfg = Release|Win32
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release|x64.ActiveCfg = Release|x64
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release|x64.Build.0 = Release|x64
@@ -276,6 +343,16 @@ Global
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.ReleaseLib|x64.Build.0 = Release|x64
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.ReleaseLib|x86.ActiveCfg = Release-Static|Win32
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.ReleaseLib|x86.Build.0 = Release-Static|Win32
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Beta|Any CPU.ActiveCfg = Release|Win32
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Beta|x64.ActiveCfg = Release|x64
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Beta|x64.Build.0 = Release|x64
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Beta|x86.ActiveCfg = Release|Win32
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Beta|x86.Build.0 = Release|Win32
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|x64.ActiveCfg = Debug|x64
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|x64.Build.0 = Debug|x64
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|x86.ActiveCfg = Debug|Win32
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|x86.Build.0 = Debug|Win32
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release|Any CPU.ActiveCfg = Release|Win32
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release|x64.ActiveCfg = Release|x64
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release|x64.Build.0 = Release|x64
@@ -299,6 +376,16 @@ Global
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLib|x64.Build.0 = Release|x64
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLib|x86.ActiveCfg = Release-Static|Win32
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLib|x86.Build.0 = Release-Static|Win32
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Beta|Any CPU.ActiveCfg = Release|Win32
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Beta|x64.ActiveCfg = Release|x64
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Beta|x64.Build.0 = Release|x64
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Beta|x86.ActiveCfg = Release|Win32
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Beta|x86.Build.0 = Release|Win32
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug|x64.ActiveCfg = Debug|x64
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug|x64.Build.0 = Debug|x64
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug|x86.ActiveCfg = Debug|Win32
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug|x86.Build.0 = Debug|Win32
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release|Any CPU.ActiveCfg = Release|Win32
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release|x64.ActiveCfg = Release|x64
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release|x64.Build.0 = Release|x64
@@ -322,6 +409,16 @@ Global
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.ReleaseLib|x64.Build.0 = Release|x64
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.ReleaseLib|x86.ActiveCfg = Release-Static|Win32
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.ReleaseLib|x86.Build.0 = Release-Static|Win32
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Beta|Any CPU.ActiveCfg = Release|Win32
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Beta|x64.ActiveCfg = Release|x64
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Beta|x64.Build.0 = Release|x64
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Beta|x86.ActiveCfg = Release|Win32
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Beta|x86.Build.0 = Release|Win32
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug|x64.ActiveCfg = Debug|x64
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug|x64.Build.0 = Debug|x64
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug|x86.ActiveCfg = Debug|Win32
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug|x86.Build.0 = Debug|Win32
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release|Any CPU.ActiveCfg = Release|Win32
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release|x64.ActiveCfg = Release|x64
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release|x64.Build.0 = Release|x64
@@ -345,6 +442,16 @@ Global
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.ReleaseLib|x64.Build.0 = Release|x64
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.ReleaseLib|x86.ActiveCfg = Release-Static|Win32
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.ReleaseLib|x86.Build.0 = Release-Static|Win32
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Beta|Any CPU.ActiveCfg = Release|Win32
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Beta|x64.ActiveCfg = Release|x64
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Beta|x64.Build.0 = Release|x64
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Beta|x86.ActiveCfg = Release|Win32
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Beta|x86.Build.0 = Release|Win32
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug|x64.ActiveCfg = Debug|x64
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug|x64.Build.0 = Debug|x64
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug|x86.ActiveCfg = Debug|Win32
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug|x86.Build.0 = Debug|Win32
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release|Any CPU.ActiveCfg = Release|Win32
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release|x64.ActiveCfg = Release|x64
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release|x64.Build.0 = Release|x64
@@ -368,6 +475,16 @@ Global
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.ReleaseLib|x64.Build.0 = Release|x64
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.ReleaseLib|x86.ActiveCfg = Release-Static|Win32
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.ReleaseLib|x86.Build.0 = Release-Static|Win32
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Beta|Any CPU.ActiveCfg = Release|Win32
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Beta|x64.ActiveCfg = Release|x64
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Beta|x64.Build.0 = Release|x64
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Beta|x86.ActiveCfg = Release|Win32
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Beta|x86.Build.0 = Release|Win32
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug|x64.ActiveCfg = Debug|x64
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug|x64.Build.0 = Debug|x64
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug|x86.ActiveCfg = Debug|Win32
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug|x86.Build.0 = Debug|Win32
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release|Any CPU.ActiveCfg = Release|Win32
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release|x64.ActiveCfg = Release|x64
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release|x64.Build.0 = Release|x64
@@ -391,6 +508,16 @@ Global
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.ReleaseLib|x64.Build.0 = Release|x64
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.ReleaseLib|x86.ActiveCfg = Release-Static|Win32
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.ReleaseLib|x86.Build.0 = Release-Static|Win32
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Beta|Any CPU.ActiveCfg = Release|Win32
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Beta|x64.ActiveCfg = Release|x64
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Beta|x64.Build.0 = Release|x64
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Beta|x86.ActiveCfg = Release|Win32
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Beta|x86.Build.0 = Release|Win32
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug|x64.ActiveCfg = Debug|x64
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug|x64.Build.0 = Debug|x64
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug|x86.ActiveCfg = Debug|Win32
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug|x86.Build.0 = Debug|Win32
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release|Any CPU.ActiveCfg = Release|Win32
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release|x64.ActiveCfg = Release|x64
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release|x64.Build.0 = Release|x64
@@ -414,15 +541,79 @@ Global
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.ReleaseLib|x64.Build.0 = Release|x64
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.ReleaseLib|x86.ActiveCfg = Release-Static|Win32
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.ReleaseLib|x86.Build.0 = Release-Static|Win32
+		{711397CE-E5D5-467D-9457-8716C047E50C}.Beta|Any CPU.ActiveCfg = Release|Win32
+		{711397CE-E5D5-467D-9457-8716C047E50C}.Beta|x64.ActiveCfg = Release|x64
+		{711397CE-E5D5-467D-9457-8716C047E50C}.Beta|x64.Build.0 = Release|x64
+		{711397CE-E5D5-467D-9457-8716C047E50C}.Beta|x86.ActiveCfg = Release|Win32
+		{711397CE-E5D5-467D-9457-8716C047E50C}.Beta|x86.Build.0 = Release|Win32
+		{711397CE-E5D5-467D-9457-8716C047E50C}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{711397CE-E5D5-467D-9457-8716C047E50C}.Debug|x64.ActiveCfg = Debug|x64
+		{711397CE-E5D5-467D-9457-8716C047E50C}.Debug|x64.Build.0 = Debug|x64
+		{711397CE-E5D5-467D-9457-8716C047E50C}.Debug|x86.ActiveCfg = Debug|Win32
+		{711397CE-E5D5-467D-9457-8716C047E50C}.Debug|x86.Build.0 = Debug|Win32
+		{711397CE-E5D5-467D-9457-8716C047E50C}.Release|Any CPU.ActiveCfg = Release|Win32
+		{711397CE-E5D5-467D-9457-8716C047E50C}.Release|x64.ActiveCfg = Release|x64
+		{711397CE-E5D5-467D-9457-8716C047E50C}.Release|x64.Build.0 = Release|x64
+		{711397CE-E5D5-467D-9457-8716C047E50C}.Release|x86.ActiveCfg = Release|Win32
+		{711397CE-E5D5-467D-9457-8716C047E50C}.Release|x86.Build.0 = Release|Win32
+		{711397CE-E5D5-467D-9457-8716C047E50C}.ReleaseCompile|Any CPU.ActiveCfg = Release|x64
+		{711397CE-E5D5-467D-9457-8716C047E50C}.ReleaseCompile|Any CPU.Build.0 = Release|x64
+		{711397CE-E5D5-467D-9457-8716C047E50C}.ReleaseCompile|x64.ActiveCfg = Release|x64
+		{711397CE-E5D5-467D-9457-8716C047E50C}.ReleaseCompile|x64.Build.0 = Release|x64
+		{711397CE-E5D5-467D-9457-8716C047E50C}.ReleaseCompile|x86.ActiveCfg = Release|Win32
+		{711397CE-E5D5-467D-9457-8716C047E50C}.ReleaseCompile|x86.Build.0 = Release|Win32
+		{711397CE-E5D5-467D-9457-8716C047E50C}.ReleaseLib_win32|Any CPU.ActiveCfg = Release|x64
+		{711397CE-E5D5-467D-9457-8716C047E50C}.ReleaseLib_win32|Any CPU.Build.0 = Release|x64
+		{711397CE-E5D5-467D-9457-8716C047E50C}.ReleaseLib_win32|x64.ActiveCfg = Release|x64
+		{711397CE-E5D5-467D-9457-8716C047E50C}.ReleaseLib_win32|x64.Build.0 = Release|x64
+		{711397CE-E5D5-467D-9457-8716C047E50C}.ReleaseLib_win32|x86.ActiveCfg = Release|Win32
+		{711397CE-E5D5-467D-9457-8716C047E50C}.ReleaseLib_win32|x86.Build.0 = Release|Win32
+		{711397CE-E5D5-467D-9457-8716C047E50C}.ReleaseLib|Any CPU.ActiveCfg = Release|x64
+		{711397CE-E5D5-467D-9457-8716C047E50C}.ReleaseLib|Any CPU.Build.0 = Release|x64
+		{711397CE-E5D5-467D-9457-8716C047E50C}.ReleaseLib|x64.ActiveCfg = Release|x64
+		{711397CE-E5D5-467D-9457-8716C047E50C}.ReleaseLib|x64.Build.0 = Release|x64
+		{711397CE-E5D5-467D-9457-8716C047E50C}.ReleaseLib|x86.ActiveCfg = Release|Win32
+		{711397CE-E5D5-467D-9457-8716C047E50C}.ReleaseLib|x86.Build.0 = Release|Win32
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.Beta|Any CPU.ActiveCfg = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.Beta|Any CPU.Build.0 = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.Beta|x64.ActiveCfg = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.Beta|x64.Build.0 = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.Beta|x86.ActiveCfg = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.Beta|x86.Build.0 = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.Debug|x64.ActiveCfg = Debug|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.Debug|x64.Build.0 = Debug|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.Debug|x86.ActiveCfg = Debug|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.Release|Any CPU.ActiveCfg = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.Release|x64.ActiveCfg = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.Release|x64.Build.0 = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.Release|x86.ActiveCfg = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.ReleaseCompile|Any CPU.ActiveCfg = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.ReleaseCompile|Any CPU.Build.0 = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.ReleaseCompile|x64.ActiveCfg = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.ReleaseCompile|x64.Build.0 = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.ReleaseCompile|x86.ActiveCfg = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.ReleaseCompile|x86.Build.0 = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.ReleaseLib_win32|Any CPU.ActiveCfg = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.ReleaseLib_win32|Any CPU.Build.0 = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.ReleaseLib_win32|x64.ActiveCfg = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.ReleaseLib_win32|x64.Build.0 = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.ReleaseLib_win32|x86.ActiveCfg = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.ReleaseLib_win32|x86.Build.0 = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.ReleaseLib|Any CPU.ActiveCfg = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.ReleaseLib|Any CPU.Build.0 = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.ReleaseLib|x64.ActiveCfg = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.ReleaseLib|x64.Build.0 = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.ReleaseLib|x86.ActiveCfg = Release|x64
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027}.ReleaseLib|x86.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{0F6318E4-4C06-384E-BCA8-F344DA187957} = {1ECB5BD6-B3A0-4135-BA3F-48FC367B61C9}
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3} = {B6752729-7398-46FA-9CF0-DC854C6AB8CA}
-		{A604BA33-C1DB-34F6-8584-C429857717A8} = {31F92F98-3580-445D-A3DA-D081B427A562}
-		{8C3AD0D4-A52C-3EFB-A2C6-04EA3AB5F00E} = {31F92F98-3580-445D-A3DA-D081B427A562}
+		{1CA4822C-F599-3879-A78F-332D823E4871} = {B6752729-7398-46FA-9CF0-DC854C6AB8CA}
+		{774F1C61-6659-36E6-9519-17A753890576} = {31F92F98-3580-445D-A3DA-D081B427A562}
+		{2CFF20AA-9341-3564-A044-C38E70D5372A} = {31F92F98-3580-445D-A3DA-D081B427A562}
 		{DBBFBC55-1C20-4D21-AE3B-6E8B14C4FE48} = {1ECB5BD6-B3A0-4135-BA3F-48FC367B61C9}
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {14A77BA7-0E23-4D8F-A74F-5D5D5583035D}
 		{14A77BA7-0E23-4D8F-A74F-5D5D5583035D} = {B4FD804C-ABD9-4F54-858B-911F0119580C}
@@ -436,6 +627,8 @@ Global
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {14A77BA7-0E23-4D8F-A74F-5D5D5583035D}
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {14A77BA7-0E23-4D8F-A74F-5D5D5583035D}
 		{B4FD804C-ABD9-4F54-858B-911F0119580C} = {B6752729-7398-46FA-9CF0-DC854C6AB8CA}
+		{711397CE-E5D5-467D-9457-8716C047E50C} = {B4FD804C-ABD9-4F54-858B-911F0119580C}
+		{A1BDC12C-5DF6-3E77-9793-AB9AB5C82027} = {1ECB5BD6-B3A0-4135-BA3F-48FC367B61C9}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5C2901E8-26FE-444A-A80E-02AF8147CD34}