Skip to content

Commit 8c34a4e

Browse files
General Project Update
- Updated version_support.md - Removed compiling option with MinGW on Windows - Updated minimum build requirements: cmake > 3.19 - Dropped support for Windows 10
1 parent b8d47ab commit 8c34a4e

File tree

5 files changed

+6
-61
lines changed

5 files changed

+6
-61
lines changed

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
# General cmake settings
33
###
44

5-
cmake_minimum_required(VERSION 3.18.3)
6-
cmake_policy(SET CMP0042 NEW)
5+
cmake_minimum_required(VERSION 3.19)
76
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
87
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
98
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)

cmake/modules/cpack_config.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ elseif (EXISTS "/etc/debian_version" AND (NOT EXISTS WIN32)) # Pa
4848
set(CPACK_DEBIAN_PACKAGE_RELEASE "1")
4949

5050
# CPACK_DEBIAN_PACKAGE_ARCHITECTURE --> Default: Output of dpkg --print-architecture
51-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "pkg-config, build-essential, debhelper (>=9), cmake (>= 3.18.3), libusb-1.0-0-dev (>= 1.0.24)")
51+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "pkg-config, build-essential, debhelper (>=9), cmake (>= 3.19), libusb-1.0-0-dev (>= 1.0.24)")
5252
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Nightwalker-87 <stlink-org>")
5353
# CPACK_DEBIAN_PACKAGE_DESCRIPTION --> Default: CPACK_DEBIAN_PACKAGE_DESCRIPTION (as it is set)
5454
# CPACK_DEBIAN_PACKAGE_SECTION --> Default: “devel”

doc/compiling.md

Lines changed: 3 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,13 @@
11
# Compiling from sources
22

3-
4-
## Microsoft Windows - MINGW (10, 11)
5-
6-
### Common Requirements
7-
8-
On Windows users should ensure that the following software is installed:
9-
10-
- `git` (_optional, but recommended_)
11-
- `7zip`
12-
- `MSYS2`
13-
14-
### Installation
15-
16-
1. Install `MSYS2` from <https://www.msys2.org/><br />
17-
Follow the installation instructions on the website.
18-
2. Install `mingw-w64` via the MSYS2 UCRT64 Shell: `pacman -S mingw-w64-x86_64-cmake mingw-w64-x86_64-make mingw-w64-x86_64-gcc git`
19-
3. Fetch the project sourcefiles by running `git clone https://github.com/stlink-org/stlink.git`from the command-line (cmd.exe)<br />
20-
or download and extract (`7zip`) the stlink zip-sourcefolder from the Release page on GitHub.
21-
22-
### Building
23-
24-
1. Open the command-line (cmd.exe) with administrator privileges
25-
2. Move to the `stlink` directory and execute `C:\$Path-to-your-stlink-folder$\mingw64-build.bat`
26-
27-
Depending on the flavour of compilation the final executables will be placed in the following directories:
28-
- Local compilation: `<project_root>\build-mingw\bin`
29-
- Local installation: `C:\Program Files (x86)\stlink\bin`
30-
- Package Generation (portable): `C:\Users\swift\Desktop\stlink\build-mingw\dist`
31-
32-
#### Removal:
33-
34-
Remove `C:\Program Files (x86)\stlink\` and `C:\$Path-to-your-stlink-folder$`.
35-
36-
37-
**NOTE:**
38-
39-
[ST-LINK drivers](https://www.st.com/en/development-tools/stsw-link009.html) are required for programmers to work with `stlink`.
40-
41-
42-
## Microsoft Windows - MSVC (10, 11)
3+
## Microsoft Windows - MSVC (11)
434

445
### Common Requirements
456

467
On Windows users should ensure that the following software is installed:
478

489
- `git` (Required for building LibUSB if missing)
49-
- `7zip`
10+
- `7zip` (_optional_)
5011
- `cmake`
5112
- `MSVC` Compiler (Tested with Visual Studio 2022 and Build Tools for Visual Studio 2022)
5213

@@ -97,7 +58,7 @@ Install the following packages from your package repository:
9758
- `libgtk-3-dev` (_optional_, needed for `stlink-gui`)
9859
- `pandoc` (_optional_, needed for generating manpages from markdown)
9960

100-
or execute (Debian-based systems only): `apt-get install gcc build-essential cmake rpm libusb-1.0-0 libusb-1.0-0-dev libgtk-3-dev pandoc`
61+
or execute (Debian-based systems only): `apt-get install gcc build-essential cmake rpm libusb-1.0-0 libusb-1.0-0-dev libgtk-4-dev pandoc`
10162

10263
(Replace gcc with the intended C-compiler if necessary or leave out any optional package not needed.)
10364

doc/version_support.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
### Microsoft Windows
44

5-
On Windows users should ensure that cmake **3.18.3** or any later version is installed.<br />
5+
On Windows users should ensure that cmake **3.19** or any later version is installed.<br />
66
Up on compiling c-make will **automatically** download and install the latest compatible version of `libusb`.
77

8-
- Windows 10
98
- Windows 11
109

1110
### Linux-/Unix-based:
@@ -49,12 +48,8 @@ Systems with highlighted versions remain compatible with this toolset until furt
4948
| NetBSD 8.x | 1.0.**24** | 3.**19.7** | May 2024 |
5049
| OpenMandriva Lx 4.2 | 1.0.**24** | 3.**19.3** | Mar 2023 |
5150
| Mageia 8 | 1.0.**24** | 3.**19.2** | Aug 2022 |
52-
| Debian 11 (Bullseye) | 1.0.**24** | 3.**18.4** | Jun 2024 |
53-
| Alpine 3.13 | 1.0.**24** | 3.**18.4** | Nov 2022 |
54-
| Ubuntu 21.04 (Hirsute) | 1.0.**24** | 3.**18.4** | Jan 2022 |
5551
| Adélie 1.0 | 1.0.23 | 3.**23.5** | |
5652
| CentOS / Rocky Linux / AlmaLinux 8 [x64] | 1.0.23 (`libusbx`) | 3.**20.3** | Dec 2021 |
5753
| CentOS 8 Stream [x64] | 1.0.23 (`libusbx`) | 3.**20.2** | May 2024 |
58-
| Fedora 33 [x64] | 1.0.23 (`libusbx`) | 3.**18.3** | Nov 2021 |
5954

6055
_All other operating systems which are not listed are unsupported._

mingw64-build.bat

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)