Skip to content

Commit

Permalink
updated installer.
Browse files Browse the repository at this point in the history
  • Loading branch information
@treefrogframework
treefrogframework committed May 28, 2022
1 parent 2ace536 commit 27504ba
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion build.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ rem

set BASEDIR=%~dp0

call "C:\Qt\6.2.0\msvc2019_64\bin\qtenv2.bat"
call "C:\Qt\6.3.0\msvc2019_64\bin\qtenv2.bat"
rem call "C:\Qt\5.13.0\msvc2017\bin\qtenv2.bat"

set VSVER=2019
Expand Down
1 change: 1 addition & 0 deletions installer/create_installer.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ call %1
if exist "%TFDIR%" rmdir /s /q "%TFDIR%"
cd /D %BASEDIR%
call ..\compile_install.bat
del /q %TFDIR%\bin\*.pdb >nul 2>&1
call :create_installer %2
goto :eof

Expand Down
4 changes: 2 additions & 2 deletions installer/treefrog-setup/treefrog-setup/AssemblyInfo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using namespace System::Security::Permissions;
[assembly:AssemblyConfigurationAttribute("")];
[assembly:AssemblyCompanyAttribute("")];
[assembly:AssemblyProductAttribute("treefrogsetup")];
[assembly:AssemblyCopyrightAttribute("Copyright (c) 2010-2021")];
[assembly:AssemblyCopyrightAttribute("Copyright (c) 2010-2022")];
[assembly:AssemblyTrademarkAttribute("")];
[assembly:AssemblyCultureAttribute("")];

Expand All @@ -31,7 +31,7 @@ using namespace System::Security::Permissions;
// すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を
// 既定値にすることができます:

[assembly:AssemblyVersionAttribute("2.3.0")];
[assembly:AssemblyVersionAttribute("2.3.1")];

[assembly:ComVisible(false)];

Expand Down
8 changes: 4 additions & 4 deletions installer/treefrog-setup/treefrog-setup/MainForm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ namespace treefrogsetup {
//
// バージョン
//
static initonly String^ VERSION_STR6_NEW = L"6.2";
static initonly String^ VERSION_STR6_PREV = L"6.1";
static initonly String^ VERSION_STR6_NEW = L"6.3";
static initonly String^ VERSION_STR6_PREV = L"6.2";

static initonly int RCID_NEW = IDR_TREEFROG_QT602_MSI;
static initonly int RCID_PREV = IDR_TREEFROG_QT601_MSI;
static initonly int RCID_NEW = IDR_TREEFROG_QT603_MSI;
static initonly int RCID_PREV = IDR_TREEFROG_QT602_MSI;

public:
MainForm(void)
Expand Down
2 changes: 1 addition & 1 deletion installer/treefrog-setup/treefrog-setup/app.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_TREEFROG_QT602_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt6.2.msi"

LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_TREEFROG_QT601_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt6.1.msi"
IDR_TREEFROG_QT603_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt6.3.msi"

//
// String Table resources
Expand Down
1 change: 1 addition & 0 deletions installer/treefrog-setup/treefrog-setup/resource.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@
#define IDR_TREEFROG_QT603_MSI 10603
#define IDR_TREEFROG_QT604_MSI 10604
#define IDR_TREEFROG_QT605_MSI 10605
#define IDR_TREEFROG_QT606_MSI 10606
2 changes: 1 addition & 1 deletion src/corelib.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ lessThan(QT_MAJOR_VERSION, 6) {
windows:QMAKE_CXXFLAGS += /std:c++14
} else {
CONFIG += c++17
windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17
windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17 /permissive-
}

DEFINES *= QT_USE_QSTRINGBUILDER
Expand Down
2 changes: 1 addition & 1 deletion tools/tfmanager/tfmanager.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ lessThan(QT_MAJOR_VERSION, 6) {
windows:QMAKE_CXXFLAGS += /std:c++14
} else {
CONFIG += c++17
windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17
windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17 /permissive-
}

DEFINES *= QT_USE_QSTRINGBUILDER
Expand Down
2 changes: 1 addition & 1 deletion tools/tfserver/tfserver.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ lessThan(QT_MAJOR_VERSION, 6) {
windows:QMAKE_CXXFLAGS += /std:c++14
} else {
CONFIG += c++17
windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17
windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17 /permissive-
}

DEFINES *= QT_USE_QSTRINGBUILDER
Expand Down
2 changes: 1 addition & 1 deletion tools/tmake/tmake.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ lessThan(QT_MAJOR_VERSION, 6) {
windows:QMAKE_CXXFLAGS += /std:c++14
} else {
CONFIG += c++17
windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17
windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17 /permissive-
}

INCLUDEPATH += ../../include
Expand Down
2 changes: 1 addition & 1 deletion tools/tspawn/tspawn.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ lessThan(QT_MAJOR_VERSION, 6) {
windows:QMAKE_CXXFLAGS += /std:c++14
} else {
CONFIG += c++17
windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17
windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17 /permissive-
}

DEFINES *= QT_USE_QSTRINGBUILDER
Expand Down

0 comments on commit 27504ba

Please sign in to comment.