Skip to content

Commit 27504ba

Browse files
updated installer.
1 parent 2ace536 commit 27504ba

File tree

11 files changed

+15
-13
lines changed

11 files changed

+15
-13
lines changed

build.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ rem
77

88
set BASEDIR=%~dp0
99

10-
call "C:\Qt\6.2.0\msvc2019_64\bin\qtenv2.bat"
10+
call "C:\Qt\6.3.0\msvc2019_64\bin\qtenv2.bat"
1111
rem call "C:\Qt\5.13.0\msvc2017\bin\qtenv2.bat"
1212

1313
set VSVER=2019

installer/create_installer.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ call %1
6161
if exist "%TFDIR%" rmdir /s /q "%TFDIR%"
6262
cd /D %BASEDIR%
6363
call ..\compile_install.bat
64+
del /q %TFDIR%\bin\*.pdb >nul 2>&1
6465
call :create_installer %2
6566
goto :eof
6667

installer/treefrog-setup/treefrog-setup/AssemblyInfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ using namespace System::Security::Permissions;
1616
[assembly:AssemblyConfigurationAttribute("")];
1717
[assembly:AssemblyCompanyAttribute("")];
1818
[assembly:AssemblyProductAttribute("treefrogsetup")];
19-
[assembly:AssemblyCopyrightAttribute("Copyright (c) 2010-2021")];
19+
[assembly:AssemblyCopyrightAttribute("Copyright (c) 2010-2022")];
2020
[assembly:AssemblyTrademarkAttribute("")];
2121
[assembly:AssemblyCultureAttribute("")];
2222

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

34-
[assembly:AssemblyVersionAttribute("2.3.0")];
34+
[assembly:AssemblyVersionAttribute("2.3.1")];
3535

3636
[assembly:ComVisible(false)];
3737

installer/treefrog-setup/treefrog-setup/MainForm.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ namespace treefrogsetup {
4747
//
4848
// バージョン
4949
//
50-
static initonly String^ VERSION_STR6_NEW = L"6.2";
51-
static initonly String^ VERSION_STR6_PREV = L"6.1";
50+
static initonly String^ VERSION_STR6_NEW = L"6.3";
51+
static initonly String^ VERSION_STR6_PREV = L"6.2";
5252

53-
static initonly int RCID_NEW = IDR_TREEFROG_QT602_MSI;
54-
static initonly int RCID_PREV = IDR_TREEFROG_QT601_MSI;
53+
static initonly int RCID_NEW = IDR_TREEFROG_QT603_MSI;
54+
static initonly int RCID_PREV = IDR_TREEFROG_QT602_MSI;
5555

5656
public:
5757
MainForm(void)

installer/treefrog-setup/treefrog-setup/app.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
2121
IDR_TREEFROG_QT602_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt6.2.msi"
2222

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

2626
//
2727
// String Table resources

installer/treefrog-setup/treefrog-setup/resource.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@
1111
#define IDR_TREEFROG_QT603_MSI 10603
1212
#define IDR_TREEFROG_QT604_MSI 10604
1313
#define IDR_TREEFROG_QT605_MSI 10605
14+
#define IDR_TREEFROG_QT606_MSI 10606

src/corelib.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ lessThan(QT_MAJOR_VERSION, 6) {
88
windows:QMAKE_CXXFLAGS += /std:c++14
99
} else {
1010
CONFIG += c++17
11-
windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17
11+
windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17 /permissive-
1212
}
1313

1414
DEFINES *= QT_USE_QSTRINGBUILDER

tools/tfmanager/tfmanager.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ lessThan(QT_MAJOR_VERSION, 6) {
1010
windows:QMAKE_CXXFLAGS += /std:c++14
1111
} else {
1212
CONFIG += c++17
13-
windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17
13+
windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17 /permissive-
1414
}
1515

1616
DEFINES *= QT_USE_QSTRINGBUILDER

tools/tfserver/tfserver.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ lessThan(QT_MAJOR_VERSION, 6) {
1010
windows:QMAKE_CXXFLAGS += /std:c++14
1111
} else {
1212
CONFIG += c++17
13-
windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17
13+
windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17 /permissive-
1414
}
1515

1616
DEFINES *= QT_USE_QSTRINGBUILDER

tools/tmake/tmake.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ lessThan(QT_MAJOR_VERSION, 6) {
99
windows:QMAKE_CXXFLAGS += /std:c++14
1010
} else {
1111
CONFIG += c++17
12-
windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17
12+
windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17 /permissive-
1313
}
1414

1515
INCLUDEPATH += ../../include

0 commit comments

Comments
 (0)