Skip to content

Commit 46512f3

Browse files
lmintlcxlmintlcx
committed
update 2.7.5
1 parent dede3a2 commit 46512f3

37 files changed

+931
-1927
lines changed

‎.clang-format

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
Language: Cpp
3+
BasedOnStyle: LLVM
4+
SortIncludes: true
5+
ColumnLimit: 0
6+
UseTab: Never
7+
TabWidth: 4
8+
IndentWidth: 4
9+
BreakBeforeBraces: Allman
10+
AccessModifierOffset: -2
11+
AllowShortLambdasOnASingleLine: None
12+
SpacesBeforeTrailingComments: 1
13+
---

‎.vscode/c_cpp_properties.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
{
44
"name": "Win32",
55
"includePath": [
6-
"C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.29.30133/include",
7-
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/ucrt",
8-
"C:/Dev/Qt_5.15.10/msvc2019_x86/shared/include",
9-
"C:/Dev/Qt_5.15.10/msvc2019_x86/shared/include/QtCore",
10-
"C:/Dev/Qt_5.15.10/msvc2019_x86/shared/include/QtGui",
11-
"C:/Dev/Qt_5.15.10/msvc2019_x86/shared/include/QtWidgets",
12-
"C:/Dev/Qt_5.15.10/msvc2019_x86/shared/include/QtNetwork",
13-
"C:/Dev/OpenSSL_1.1.1u/msvc2019_x86/shared/include",
14-
"C:/Dev/zlib_1.2.13/msvc2019_x86/shared/include",
6+
"C:/VisualStudio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/include",
7+
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.17763.0/ucrt",
8+
"C:/Dev/Qt_5.15.14/msvc2017_x86/shared/include",
9+
"C:/Dev/Qt_5.15.14/msvc2017_x86/shared/include/QtCore",
10+
"C:/Dev/Qt_5.15.14/msvc2017_x86/shared/include/QtGui",
11+
"C:/Dev/Qt_5.15.14/msvc2017_x86/shared/include/QtWidgets",
12+
"C:/Dev/Qt_5.15.14/msvc2017_x86/shared/include/QtNetwork",
13+
"C:/Dev/OpenSSL_1.1.1w/msvc2017_x86/shared/include",
14+
"C:/Dev/zlib_1.3.1/msvc2017_x86/shared/include",
1515
"${workspaceFolder}/**"
1616
],
1717
"defines": [
1818
"_DEBUG",
1919
"UNICODE",
2020
"_UNICODE"
2121
],
22-
"windowsSdkVersion": "10.0.19041.0",
23-
"compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx86/x86/cl.exe",
22+
"windowsSdkVersion": "10.0.17763.0",
23+
"compilerPath": "C:/VisualStudio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx86/x86/cl.exe",
2424
"cStandard": "c17",
25-
"cppStandard": "c++20",
25+
"cppStandard": "c++17",
2626
"intelliSenseMode": "msvc-x86"
2727
}
2828
],

‎.vscode/settings.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@
149149
"concepts": "cpp",
150150
"coroutine": "cpp",
151151
"format": "cpp",
152-
"stop_token": "cpp"
152+
"stop_token": "cpp",
153+
"qlocalsocket": "cpp",
154+
"qlocale": "cpp"
153155
}
154156
}

‎CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@
66
**PvZ Tools 已被废弃, 推荐使用 [PvZ Toolkit](https://pvz.lmintlcx.com/toolkit/) 代替.**
77

88

9+
## [2.7.5] - 2024/06/18
10+
11+
- 帮助菜单, "帮助文档"加回来了.
12+
- 默认**不**显示新的阵型字符串格式.
13+
- 默认智慧树高度 1000.
14+
- 部分错误数值修复.
15+
- 部分代码细节优化.
16+
917
## [2.7.4] - 2023/06/30
1018

1119
- 更新了版本号.

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ Supported game version:
2323

2424
## Build
2525

26-
You need a C++20 compiler and Qt 5 libraries to build it.
26+
You need a C++17 compiler and Qt 5 libraries to build it.
2727

2828
Qt must be linked with OpenSSL or Schannel, zlib is also required.
2929

3030
Already tested and confirmed works with:
3131

3232
| Qt | OpenSSL | zlib | Compiler |
3333
| ------- | ------- | --------- | --------- |
34-
| 5.15.10 | 1.1.1u | 1.2.13 | MSVC 2019 |
34+
| 5.15.14 | 1.1.1w | 1.3.1 | MSVC 2017 |
3535

3636
## Credit
3737

‎dependencies/build_qt_openssl_zlib.md

+125
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
2+
# OpenSSL
3+
4+
```bat
5+
6+
call "C:\VisualStudio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x86
7+
8+
set SRC_DIR=C:\Dev\OpenSSL_1.1.1w\openssl-1.1.1w
9+
set INS_DIR=C:\Dev\OpenSSL_1.1.1w\msvc2017_x86\shared
10+
11+
cd /d %SRC_DIR%
12+
perl Configure VC-WIN32 no-asm no-tests --prefix=%INS_DIR% --openssldir=%INS_DIR%
13+
14+
rem makefile
15+
rem /O1 /utf-8
16+
17+
nmake
18+
nmake install
19+
20+
```
21+
22+
```txt
23+
INS_DIR *shared -> *static
24+
perl Configure + no-shared
25+
```
26+
27+
# Qt
28+
29+
```bat
30+
31+
rem qtbase\qmake\Makefile.win32
32+
rem CFLAGS_BARE /O1 /utf-8
33+
34+
rem qtbase\mkspecs\common\msvc-desktop.conf
35+
rem QMAKE_CFLAGS /utf-8 -DNOMINMAX
36+
rem QMAKE_CFLAGS_OPTIMIZE = -O1
37+
38+
39+
call "C:\VisualStudio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x86
40+
41+
set SRC_DIR=C:\Dev\Qt_5.15.14
42+
set INS_DIR=C:\Dev\Qt_5.15.14\msvc2017_x86\shared
43+
44+
45+
cd /d %SRC_DIR%\qtbase-everywhere-src-5.15.14
46+
47+
git apply ..\CVE-2023-32763-qtbase-5.15.diff
48+
git apply ..\CVE-2023-34410-qtbase-5.15.diff
49+
git apply ..\CVE-2023-37369-qtbase-5.15.diff
50+
git apply ..\CVE-2023-38197-qtbase-5.15.diff
51+
git apply ..\CVE-2023-43114-5.15.patch
52+
git apply ..\0001-CVE-2023-51714-qtbase-5.15.diff
53+
git apply ..\0002-CVE-2023-51714-qtbase-5.15.diff
54+
git apply ..\CVE-2024-25580-qtbase-5.15.diff
55+
56+
configure.bat ^
57+
-opensource -confirm-license -platform win32-msvc ^
58+
-shared -debug-and-release -prefix %INS_DIR% ^
59+
-make libs -make tools -nomake examples -nomake tests ^
60+
-sql-sqlite -sql-odbc -qt-sqlite -gif -ico -qt-libpng -qt-libjpeg ^
61+
-qt-doubleconversion -qt-pcre -qt-zlib -qt-freetype -qt-harfbuzz ^
62+
-no-icu -no-dbus -no-opengl -openssl-linked ^
63+
OPENSSL_PREFIX="C:\Dev\OpenSSL_1.1.1w\msvc2017_x86\shared" ^
64+
OPENSSL_LIBS="-llibssl -llibcrypto -lcrypt32 -lws2_32 -ladvapi32 -luser32 -lgdi32" ^
65+
-pch -mp -optimize-size -silent
66+
67+
nmake && nmake install
68+
69+
70+
cd /d %SRC_DIR%\qttools-everywhere-src-5.15.14
71+
%INS_DIR%\bin\qmake.exe qttools.pro
72+
nmake && nmake install
73+
74+
cd /d %SRC_DIR%\qtimageformats-everywhere-src-5.15.14
75+
%INS_DIR%\bin\qmake.exe qtimageformats.pro
76+
nmake && nmake install
77+
78+
```
79+
80+
```txt
81+
INS_DIR *shared -> *static
82+
OpenSSL *shared -> *static
83+
configure.bat -shared -> -static -static-runtime
84+
```
85+
86+
# zlib
87+
88+
```bat
89+
90+
rem win32/Makefile.msc
91+
rem /O1 /utf-8
92+
93+
call "C:\VisualStudio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x86
94+
95+
set SRC_DIR=C:\Dev\zlib_1.3.1\zlib-1.3.1
96+
set INS_DIR=C:\Dev\zlib_1.3.1\msvc2017_x86\shared
97+
98+
cd /d %SRC_DIR%
99+
nmake -f win32/Makefile.msc
100+
101+
102+
md %INS_DIR%\bin
103+
md %INS_DIR%\include
104+
md %INS_DIR%\lib
105+
106+
copy %SRC_DIR%\zlib.h %INS_DIR%\include
107+
copy %SRC_DIR%\zconf.h %INS_DIR%\include
108+
109+
rem static
110+
copy %SRC_DIR%\zlib.lib %INS_DIR%\lib
111+
copy %SRC_DIR%\zlib.map %INS_DIR%\lib
112+
copy %SRC_DIR%\zlib.pdb %INS_DIR%\lib
113+
114+
rem shared
115+
copy %SRC_DIR%\zlib1.dll %INS_DIR%\bin
116+
copy %SRC_DIR%\zlib1.pdb %INS_DIR%\bin
117+
copy %SRC_DIR%\zdll.lib %INS_DIR%\lib
118+
copy %SRC_DIR%\zdll.exp %INS_DIR%\lib
119+
120+
```
121+
122+
```txt
123+
INS_DIR *shared -> *static
124+
rem /MD -> /MT
125+
```

‎pvztools.pro

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ QT += core gui widgets network
77

88
DEFINES += UNICODE _UNICODE
99

10-
win32-msvc*:QMAKE_CXXFLAGS += /std:c++20 /MP /utf-8
10+
win32-msvc*:QMAKE_CXXFLAGS += /std:c++17 /MP /utf-8
1111

1212
DEFINES += _WIN32_WINNT=0x0601
1313

@@ -22,11 +22,11 @@ INCLUDEPATH += .
2222

2323
# zlib
2424
contains(CONFIG, static) {
25-
INCLUDEPATH += $$quote(C:\Dev\zlib_1.2.13\msvc2019_x86\static\include)
26-
LIBS += -L$$quote(C:\Dev\zlib_1.2.13\msvc2019_x86\static\lib) -lzlib
25+
INCLUDEPATH += $$quote(C:\Dev\zlib_1.3.1\msvc2017_x86\static\include)
26+
LIBS += -L$$quote(C:\Dev\zlib_1.3.1\msvc2017_x86\static\lib) -lzlib
2727
} else {
28-
INCLUDEPATH += $$quote(C:\Dev\zlib_1.2.13\msvc2019_x86\shared\include)
29-
LIBS += -L$$quote(C:\Dev\zlib_1.2.13\msvc2019_x86\shared\lib) -lzdll
28+
INCLUDEPATH += $$quote(C:\Dev\zlib_1.3.1\msvc2017_x86\shared\include)
29+
LIBS += -L$$quote(C:\Dev\zlib_1.3.1\msvc2017_x86\shared\lib) -lzdll
3030
}
3131

3232
win32-msvc*:PRECOMPILED_HEADER = src/stable.h

‎pvztools.qrc

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
<file>translations/qt_zh_CN.qm</file>
44
<file>translations/widgets_zh_CN.qm</file>
55
<file>translations/pvztools_zh_CN.qm</file>
6-
<file>res/logo.ico</file>
7-
<file>res/logo_about.png</file>
8-
<!-- <file>res/splash.jpg</file> -->
9-
<!-- <file>res/lineup_string.json</file> -->
6+
<file>resources/logo.ico</file>
7+
<file>resources/logo_about.png</file>
8+
<!-- <file>resources/splash.jpg</file> -->
109
</qresource>
1110
</RCC>

0 commit comments

Comments
 (0)