SHS/shstk
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

master #189

Merged
peri4 merged 5 commits from master into release 2023-07-02 14:10:59 +03:00
Conversation 0 Commits 5 Files Changed 5 +9 -7
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -2,3 +2,4 @@
CMakeLists.txt.user* CMakeLists.txt.user*
/release /release
/build /build
/*_build_*

9
README.md
View File

@@ -37,6 +37,7 @@ After successfully install, you can use next CMake imported targets:
* QAD::Application * QAD::Application
* QAD::Blockview * QAD::Blockview
* QAD::Graphic - widget for realtime visualization and publication quality 1D/2D plots * QAD::Graphic - widget for realtime visualization and publication quality 1D/2D plots
* QAD::SQL - wrapper around QtSqlQuery for code amount reduce
* QAD::SQLTable - widget for display and edit data based on SQL tables with relations * QAD::SQLTable - widget for display and edit data based on SQL tables with relations
* QAD::TouchWidgets - collection of widgets for touch screen interface * QAD::TouchWidgets - collection of widgets for touch screen interface
* QAD::Doc - markdown helper for qt * QAD::Doc - markdown helper for qt
@@ -58,7 +59,7 @@ This repo can be compiled with GCC/MinGW/Clang, for Qt 4/5.
If there is no Qt found, builds only PIP and CD. If there is no Qt found, builds only PIP and CD.
CMake options: CMake options:
* **LOCAL** - if 0 then install to system directories: MinGW on Windows, /usr/local on Linux/MacOS, ${ANDROID_SYSTEM_LIBRARY_PATH} on Android. If 1 then install to ${CMAKE_INSTALL_PREFIX}. Disabled by default * **LOCAL** - if 0 then install to system directories: MinGW on Windows, /usr/local on Linux/MacOS, ANDROID_SYSTEM_LIBRARY_PATH on Android. If 1 then install to CMAKE_INSTALL_PREFIX. Disabled by default
* **UTILS** - build or not executable utilites, enabled by default * **UTILS** - build or not executable utilites, enabled by default
* **DESIGNER_PLUGINS** - build or not Qt Designer plugins, enabled by default * **DESIGNER_PLUGINS** - build or not Qt Designer plugins, enabled by default
* **QGLVIEW** - build or not QGLView, disabled by default * **QGLVIEW** - build or not QGLView, disabled by default
@@ -71,11 +72,11 @@ Build steps:
3. Download and install cmake from https://cmake.org/download/ 3. Download and install cmake from https://cmake.org/download/
4. Prepare environment for x86 or amd64 architecture: 4. Prepare environment for x86 or amd64 architecture:
- set prefix for mingw e.g.: for C:\mingw\8_1_x32\ or C:\mingw\8_1_x64\ - set prefix for mingw e.g.: for C:\mingw\8_1_x32\ or C:\mingw\8_1_x64\
set SDK_MINGW_DIR=C:\mingw\8_1_x set `SDK_MINGW_DIR=C:\mingw\8_1_x`
- set prefix for Qt5 e.g.: for C:\qt\qt5150_win32\ or C:\qt\qt5150_win64\ - set prefix for Qt5 e.g.: for C:\qt\qt5150_win32\ or C:\qt\qt5150_win64\
set SDK_QT5_DIR=C:\qt\qt5150_win set `SDK_QT5_DIR=C:\qt\qt5150_win`
- set path to cmake directory - set path to cmake directory
set SDK_CMAKE_DIR=C:\cmake or C:\Program Files\CMake set `SDK_CMAKE_DIR=C:\cmake` or `C:\Program Files\CMake`
5. Run `make_shstk32.bat` or `make_shstk64.bat` 5. Run `make_shstk32.bat` or `make_shstk64.bat`
Build steps for both architectures: follow previous steps, but on '5' state run `make_shstk_all.bat` Build steps for both architectures: follow previous steps, but on '5' state run `make_shstk_all.bat`

2
pip

Submodule pip updated: 0ae63fa9ad...ccae1a7311

2
qad

Submodule qad updated: 7ce2b31ec9...024360dec5

2
qglengine

Submodule qglengine updated: dfc4c718e8...9c78ba5281