From 6913efdf9d28b3c0dff8985b540d3aa4cbd632cb Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 15 Jun 2023 12:34:44 +0300 Subject: [PATCH] pip,qad,readme --- README.md | 8 ++++---- pip | 2 +- qad | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index cbe91b8..15babe7 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,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. 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 * **DESIGNER_PLUGINS** - build or not Qt Designer plugins, enabled by default * **QGLVIEW** - build or not QGLView, disabled by default @@ -71,11 +71,11 @@ Build steps: 3. Download and install cmake from https://cmake.org/download/ 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 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 SDK_QT5_DIR=C:\qt\qt5150_win + set `K_QT5_DIR=C:\qt\qt5150_win` - 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` Build steps for both architectures: follow previous steps, but on '5' state run `make_shstk_all.bat` diff --git a/pip b/pip index 0ae63fa..dd56b1c 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 0ae63fa9ad1e9a0d876307da11c0375cab8be153 +Subproject commit dd56b1c142c87488c49107f4eb3586ba735a180e diff --git a/qad b/qad index 7ce2b31..024360d 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 7ce2b31ec9b78a39d84de1276e6bd0efc9d0e647 +Subproject commit 024360dec5dd99061b6d1b30a40b461b73459e33