Skip to content

Commit 1b56a17

Browse files
committed
use static fftw, usb and z libs
Signed-off-by: Martin <[email protected]>
1 parent e6d863d commit 1b56a17

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
2024-01-01 (e6d863d): next build system update
12
2024-01-01 (7f9eb94): build system update
23
2023-12-31 (3b12af2): prepare next release 3.4
34
2023-12-31 (98959ab): prepare next release 3.4

openhantek/CMakeLists.txt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
project(OpenHantek CXX)
44

5+
if(WIN32)
6+
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
7+
set(CMAKE_EXE_LINKER_FLAGS "-s")
8+
set(EXECTYPE WIN32)
9+
endif()
10+
511
find_package(Qt5Widgets REQUIRED)
612
find_package(Qt5PrintSupport REQUIRED)
713
find_package(Qt5OpenGL REQUIRED)
@@ -12,6 +18,8 @@ set(CMAKE_AUTORCC ON)
1218

1319
if (Qt5Widgets_VERSION VERSION_LESS 5.4.0)
1420
message(FATAL_ERROR "Minimum supported Qt5 version is 5.4.0!")
21+
else()
22+
message("-- Qt5 version is ${Qt5Widgets_VERSION}")
1523
endif()
1624

1725
# include directories
@@ -34,11 +42,6 @@ add_custom_target(format SOURCES ".clang-format"
3442
# here the translation magic happens
3543
include(translations/Translations.cmake)
3644

37-
set(EXECTYPE "")
38-
if(WIN32 AND MINGW)
39-
set(EXECTYPE WIN32)
40-
endif()
41-
4245
option(USE_OPENHANTEK_DRIVER "Use OpenHantek Windows driver" ON)
4346

4447
# Enable MacOSX bundle magic in the next line

0 commit comments

Comments
 (0)