modified for Qt5.7

skipbit · Sep 24, 2016 · 66df88c · 66df88c
1 parent 0b5d748
commit 66df88c
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 14 deletions.
diff --git a/3rdparty/mongo-c-driver/src/libbson/src/bson/bson.c b/3rdparty/mongo-c-driver/src/libbson/src/bson/bson.c
@@ -2332,13 +2332,17 @@ _bson_as_json_visit_double (const bson_iter_t *iter,
    bson_json_state_t *state = data;
 
 #ifdef BSON_NEEDS_SET_OUTPUT_FORMAT
+#if defined(_MSV_VER) && (_MSC_VER < 1900)
    unsigned int current_format = _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
 #endif
 
    bson_string_append_printf (state->str, "%.15g", v_double);
 
 #ifdef BSON_NEEDS_SET_OUTPUT_FORMAT
+#if defined(_MSV_VER) && (_MSC_VER < 1900)
    _set_output_format(current_format);
+#endif
 #endif
 
    return false;

diff --git a/build.bat b/build.bat
@@ -6,10 +6,12 @@
 ::
 ::call "C:\Qt\Qt5.5.1-MinGW\5.5\mingw492_32\bin\qtenv2.bat"
 ::call "C:\Qt\Qt5.6.0-MinGW\5.4\mingw492_32\bin\qtenv2.bat"
-call "C:\Qt\Qt5.5.1\5.5\msvc2013_64\bin\qtenv2.bat"
+::call "C:\Qt\Qt5.5.1\5.5\msvc2013_64\bin\qtenv2.bat"
 ::call "C:\Qt\Qt5.6.0\5.6\msvc2013_64\bin\qtenv2.bat"
+call "C:\Qt\Qt5.7.0\5.7\msvc2015_64\bin\qtenv2.bat"
 
-call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
+::call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
+call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\VsDevCmd.bat"
 
 cd /D %~dp0
 call compile_install.bat

diff --git a/configure.bat b/configure.bat
@@ -96,7 +96,9 @@ echo set QTENV="%QTENV%">> %TFENV%
 echo set QMAKESPEC=%QMAKESPEC%>> %TFENV%
 echo if exist %%QTENV%% ( call %%QTENV%% )>> %TFENV%
 if not "%VCVARSOPT%" == "" (
-  echo if not "%%VS120COMNTOOLS%%" == "" ^(>> %TFENV%
+  echo if not "%%VS140COMNTOOLS%%" == "" ^(>> %TFENV%
+  echo   set VCVARSBAT="%%VS140COMNTOOLS%%..\..\VC\vcvarsall.bat">> %TFENV%
+  echo ^) else if not "%%VS120COMNTOOLS%%" == "" ^(>> %TFENV%
   echo   set VCVARSBAT="%%VS120COMNTOOLS%%..\..\VC\vcvarsall.bat">> %TFENV%
   echo ^) else if not "%%VS110COMNTOOLS%%" == "" ^(>> %TFENV%
   echo   set VCVARSBAT="%%VS110COMNTOOLS%%..\..\VC\vcvarsall.bat">> %TFENV%

diff --git a/installer/create_installer.bat b/installer/create_installer.bat
@@ -4,25 +4,32 @@
 :: Edit this line to run the batch file for Qt environment.
 ::
 
-set VERSION=1.12.0
+set VERSION=1.13.0
 set TFDIR=C:\TreeFrog\%VERSION%
 set BASEDIR=%~dp0
 set SLNFILE=%BASEDIR%\treefrog-setup\treefrog-setup.sln
 cd %BASEDIR%
 
 :: MinGW
-call :build_msi "C:\Qt\Qt5.5.1-MinGW\5.5\mingw492_32\bin\qtenv2.bat"  5.5
-call :build_msi "C:\Qt\Qt5.6.0-MinGW\5.6\mingw49_32\bin\qtenv2.bat"   5.6
+call :build_msi "C:\Qt\Qt5.6.1-MinGW\5.6\mingw49_32\bin\qtenv2.bat"   5.6
+call :build_msi "C:\Qt\Qt5.7.0-mingw\5.7\mingw53_32\bin\qtenv2.bat"   5.7
 call :build_setup treefrog-%VERSION%-mingw-setup.exe
 
 
-:: MSVC
+:: MSVC2013
 call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
-call :build_msi "C:\Qt\Qt5.5.1\5.5\msvc2013_64\bin\qtenv2.bat"  5.5
-call :build_msi "C:\Qt\Qt5.6.0\5.6\msvc2013_64\bin\qtenv2.bat"  5.6
+call :build_msi "C:\Qt\Qt5.6.1-msvc2013\5.6\msvc2013_64\bin\qtenv2.bat"  5.6
+call :build_msi "C:\Qt\Qt5.7.0-msvc2013\5.7\msvc2013_64\bin\qtenv2.bat"  5.7
 call :build_setup treefrog-%VERSION%-msvc2013_64-setup.exe
 
 
+:: MSVC2015
+::call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+::call :build_msi "C:\Qt\Qt5.6.1\5.6\msvc2015_64\bin\qtenv2.bat"  5.6
+::call :build_msi "C:\Qt\Qt5.7.0\5.7\msvc2015_64\bin\qtenv2.bat"  5.7
+::call :build_setup treefrog-%VERSION%-msvc2015_64-setup.exe
+
+
 echo.
 echo.
 echo Creating setup files ... Completed
@@ -56,6 +63,7 @@ set MSINAME=TreeFrog-SDK-Qt%1.msi
 
 cd /D msi
 
+@rd SourceDir 2>nul
 mklink /D  SourceDir %TFDIR%
 if ERRORLEVEL 1 goto :error
 

diff --git a/installer/treefrog-setup/treefrog-setup/MainForm.h b/installer/treefrog-setup/treefrog-setup/MainForm.h
@@ -160,7 +160,7 @@ namespace treefrogsetup {
             this->label->Name = L"label";
             this->label->Size = System::Drawing::Size(309, 15);
             this->label->TabIndex = 4;
-            this->label->Text = L"Specify a base folder of Qt version 5.5 or later.";
+            this->label->Text = L"Specify a base folder of Qt version 5.6 or later.";
             // 
             // label1
             // 
@@ -171,7 +171,7 @@ namespace treefrogsetup {
             this->label1->Name = L"label1";
             this->label1->Size = System::Drawing::Size(162, 15);
             this->label1->TabIndex = 5;
-            this->label1->Text = L"Example:  C:\\Qt\\Qt5.6.0";
+            this->label1->Text = L"Example:  C:\\Qt\\Qt5.7.0";
             // 
             // labeltop
             // 
@@ -374,9 +374,9 @@ namespace treefrogsetup {
             }
 
             // Get msi file from resource
-            int rcid = IDR_TREEFROG_QT56_MSI;
-            if (version->IndexOf("Qt version 5.5", StringComparison::OrdinalIgnoreCase) > 0) {
-                rcid = IDR_TREEFROG_QT55_MSI;
+            int rcid = IDR_TREEFROG_QT57_MSI;
+            if (version->IndexOf("Qt version 5.6", StringComparison::OrdinalIgnoreCase) > 0) {
+                rcid = IDR_TREEFROG_QT56_MSI;
             }
 
             System::Reflection::Module^ mod = System::Reflection::Assembly::GetExecutingAssembly()->GetModules()[0];

diff --git a/installer/treefrog-setup/treefrog-setup/resource.h b/installer/treefrog-setup/treefrog-setup/resource.h
@@ -15,3 +15,4 @@
 #define IDR_TREEFROG_QT56_MSI                   1056
 #define IDR_TREEFROG_QT57_MSI                   1057
 #define IDR_TREEFROG_QT58_MSI                   1058
+#define IDR_TREEFROG_QT59_MSI                   1059