From e58529750c03560717b9926cd023a5983157d309 Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 7 Sep 2020 21:59:53 +0300 Subject: [PATCH 1/4] bat and README.md --- README.md | 57 +++++++++++++------ cmake | 2 +- make_libs.bat | 6 -- make_libs32.bat | 1 - make_libs64.bat | 1 - make_libs_all.bat | 2 - make_shstk.bat | 18 ++++++ make_libs.sh => make_shstk.sh | 0 make_shstk32.bat | 1 + make_shstk64.bat | 1 + make_shstk_all.bat | 2 + ...libs_android.bat => make_shstk_android.bat | 7 ++- ...roid_all.bat => make_shstk_android_all.bat | 2 +- 13 files changed, 69 insertions(+), 31 deletions(-) delete mode 100644 make_libs.bat delete mode 100644 make_libs32.bat delete mode 100644 make_libs64.bat delete mode 100644 make_libs_all.bat create mode 100644 make_shstk.bat rename make_libs.sh => make_shstk.sh (100%) create mode 100644 make_shstk32.bat create mode 100644 make_shstk64.bat create mode 100644 make_shstk_all.bat rename make_libs_android.bat => make_shstk_android.bat (58%) rename make_libs_android_all.bat => make_shstk_android_all.bat (62%) diff --git a/README.md b/README.md index 58a2a1c..3055567 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,37 @@ ## Introduction -This repo contains PIP, QAD and derived projects: -* cd_utils - PIP-based client/server library for read, transmit and use custom structures of coefficients -* qcd_utils - Qt bindings to CDUtils and "CD Pult" executable - full-featured CD client -* piqt - helpers to convert PIP <-> Qt types -* piqt_utils - Gui libraries and executables to edit PIConnection configs and watch PIIntrospection -* qglview - old Qt-base OpenGL engine +This repo contains: +* PIP +* * PIP - main library +* * PIP::USB - PIUSB (libusb) +* * PIP::Console - PIScreen +* * PIP::Crypt - Cryptography (libsodium) +* * PIP::Compress - Compression (zlib) +* * PIP::FFTW - FFT with libfftw3 +* * PIP::OpenCL - PIP OpenCL bindings +* * PIP::IOUtils +* * PIP::Cloud +* * PIP::Lua - PIP Lua bindings +* QAD - Qt for Advanced Developers: +* * QAD::Utils +* * QAD::Widgets +* * QAD::Application +* * QAD::Blockview +* * QAD::Graphic +* * QAD::SQLTable +* * QAD::TouchWidgets +* * QAD::Doc +* * QAD::PIQt - helpers to convert PIP <-> Qt types +* * QAD::PIQtUtils - Gui libraries and executables to edit PIConnection configs and watch PIIntrospection +* * qglview - old Qt-base OpenGL engine * qglengine - new Qt-base OpenGL engine - +* * QGLEngine::Core - 3d engine +* * QGLEngine::Widgets - qt widgets for manage 3d obects and materials +* CD +* * CD::Core - PIP-based client/server library for read, transmit and use custom structures of coefficients +* * CD::Qt - Qt bindings to CDUtils and "CD Pult" executable - full-featured CD client + ## Compile This repo can be compile with GCC/MinGW/Clang, for Qt 4/5. @@ -23,27 +46,25 @@ CMake options: * **QGLENGINE** - build or not QGLEngine, disabled by default ## Windows scripts -Build steps for i686 architecture: +Build steps: 1. unzip mingw.7z to C:\mingw 2. unzip qt.7z to C:\qt 3. download and install cmake from https://cmake.org/download/ -4. Prepare environment - - set prefix for mingw e.g.: for C:\mingw\7_1_x32\ +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\7_1_x - - set prefix for Qt5 e.g.: for C:\qt\qt5120_win32\ - set SDK_QT5_DIR=C:\qt\qt5120_win - - set SDK_CMAKE_DIR=C:\cmake -5. run make_libs32.bat + - 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_CMAKE_DIR=C:\cmake or C:\Program Files\CMake +5. run make_shstk32.bat or make_shstk64.bat -Build steps for amd64 architecture: - -- follow previos steps, but replace '32' to '64' Build steps for both architectures: -- follow previos steps, but on '4' state run make_libs_all.bat ## Non-Windows scripts -Script "make_libs.sh" compile and install SDK for current environment, e.g. -`./make_libs.sh -j4` +Script "make_shstk.sh" compile and install SDK for current environment, e.g. +`./make_shstk.sh -j4` ## Docker This repo provide Dockerfile, so you can exec `docker build -t libs .` in this directory diff --git a/cmake b/cmake index d1a1126..2f84d98 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit d1a11269f7e1b12c6b385f2ef703c1fcf6f30329 +Subproject commit 2f84d98a32a2b0a0b182b509b006cc29928e7221 diff --git a/make_libs.bat b/make_libs.bat deleted file mode 100644 index 6f3dfb8..0000000 --- a/make_libs.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -set ARCH=%~1 -set PATH=%SDK_MINGW_DIR%%ARCH%\bin;%SDK_QT4_DIR%%ARCH%\bin;%SDK_CMAKE_DIR%\bin -if defined SDK_QT5_DIR set Qt5_DIR=%SDK_QT5_DIR%%ARCH% -mkdir ..\shstk_build_win%ARCH% -cd ../shstk_build_win%ARCH% && cmake_mgw -Wno-dev -DQGLVIEW=1 -DQGLENGINE=1 -DQT4=0 ../shstk && make install -j4 && cd ../shstk && pause diff --git a/make_libs32.bat b/make_libs32.bat deleted file mode 100644 index c1103ef..0000000 --- a/make_libs32.bat +++ /dev/null @@ -1 +0,0 @@ -make_libs.bat 32 \ No newline at end of file diff --git a/make_libs64.bat b/make_libs64.bat deleted file mode 100644 index f12abc1..0000000 --- a/make_libs64.bat +++ /dev/null @@ -1 +0,0 @@ -make_libs.bat 64 \ No newline at end of file diff --git a/make_libs_all.bat b/make_libs_all.bat deleted file mode 100644 index b6bd18b..0000000 --- a/make_libs_all.bat +++ /dev/null @@ -1,2 +0,0 @@ -start cmd /C make_libs32.bat -start cmd /C make_libs64.bat diff --git a/make_shstk.bat b/make_shstk.bat new file mode 100644 index 0000000..ecd44f2 --- /dev/null +++ b/make_shstk.bat @@ -0,0 +1,18 @@ +@echo off +set ARCH=%~1 +if defined SDK_JOBS_COUNT ( + set JOBS_COUNT=%SDK_JOBS_COUNT% +) else ( + set JOBS_COUNT=4 +) +set PATH=%SDK_MINGW_DIR%%ARCH%\bin;%SDK_QT4_DIR%%ARCH%\bin;%SDK_CMAKE_DIR%\bin +if defined SDK_QT5_DIR set Qt5_DIR=%SDK_QT5_DIR%%ARCH% +cd cmake && ^ +call install.bat && ^ +cd .. && ^ +if not exist ..\shstk_build_win%ARCH% mkdir ..\shstk_build_win%ARCH% && ^ +cd ..\shstk_build_win%ARCH% && ^ +cmake_mgw -DQGLVIEW=1 -DQGLENGINE=1 -DQT4=0 ../shstk && ^ +make install -j%JOBS_COUNT% && ^ +cd ..\shstk && ^ +pause diff --git a/make_libs.sh b/make_shstk.sh similarity index 100% rename from make_libs.sh rename to make_shstk.sh diff --git a/make_shstk32.bat b/make_shstk32.bat new file mode 100644 index 0000000..d25b5b1 --- /dev/null +++ b/make_shstk32.bat @@ -0,0 +1 @@ +make_shstk.bat 32 \ No newline at end of file diff --git a/make_shstk64.bat b/make_shstk64.bat new file mode 100644 index 0000000..6528c45 --- /dev/null +++ b/make_shstk64.bat @@ -0,0 +1 @@ +make_shstk.bat 64 \ No newline at end of file diff --git a/make_shstk_all.bat b/make_shstk_all.bat new file mode 100644 index 0000000..61508ac --- /dev/null +++ b/make_shstk_all.bat @@ -0,0 +1,2 @@ +start cmd /C make_shstk32.bat +start cmd /C make_shstk64.bat diff --git a/make_libs_android.bat b/make_shstk_android.bat similarity index 58% rename from make_libs_android.bat rename to make_shstk_android.bat index 2ea504a..39d0826 100644 --- a/make_libs_android.bat +++ b/make_shstk_android.bat @@ -1,6 +1,11 @@ @echo off +if defined SDK_JOBS_COUNT ( + set JOBS_COUNT=%SDK_JOBS_COUNT% +) else ( + set JOBS_COUNT=4 +) mkdir ..\shstk_build_android_%~1 cd ..\shstk_build_android_%~1 call ..\shstk\cmake\cmake_android 21 %~1 ..\shstk "-DUTILS=0 -DCMAKE_BUILD_TYPE=Release" -call make install -j4 +call make install -j%JOBS_COUNT% cd ..\shstk diff --git a/make_libs_android_all.bat b/make_shstk_android_all.bat similarity index 62% rename from make_libs_android_all.bat rename to make_shstk_android_all.bat index b15632e..bcc8851 100644 --- a/make_libs_android_all.bat +++ b/make_shstk_android_all.bat @@ -1,4 +1,4 @@ @echo off for %%a in (x86,x86_64,arm,arm64) do ( - call .\make_libs_android %%a + call .\make_shstk_android %%a ) From 0d384c994f74cf521e160be4aba2334b9fa21819 Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 7 Sep 2020 22:11:56 +0300 Subject: [PATCH 2/4] fix bat --- make_shstk.bat | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/make_shstk.bat b/make_shstk.bat index ecd44f2..7bf959a 100644 --- a/make_shstk.bat +++ b/make_shstk.bat @@ -7,10 +7,7 @@ if defined SDK_JOBS_COUNT ( ) set PATH=%SDK_MINGW_DIR%%ARCH%\bin;%SDK_QT4_DIR%%ARCH%\bin;%SDK_CMAKE_DIR%\bin if defined SDK_QT5_DIR set Qt5_DIR=%SDK_QT5_DIR%%ARCH% -cd cmake && ^ -call install.bat && ^ -cd .. && ^ -if not exist ..\shstk_build_win%ARCH% mkdir ..\shstk_build_win%ARCH% && ^ +if not exist ..\shstk_build_win%ARCH% mkdir ..\shstk_build_win%ARCH% cd ..\shstk_build_win%ARCH% && ^ cmake_mgw -DQGLVIEW=1 -DQGLENGINE=1 -DQT4=0 ../shstk && ^ make install -j%JOBS_COUNT% && ^ From d031992169dff0c432478bf323507b16881622f7 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Mon, 7 Sep 2020 22:21:44 +0300 Subject: [PATCH 3/4] minimum cmake version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f146c86..d5af94e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.16) cmake_policy(SET CMP0011 NEW) # don`t affect includer policies cmake_policy(SET CMP0017 NEW) # need include() with .cmake cmake_policy(SET CMP0020 NEW) # Automatically link Qt executables to qtmain target on Windows From e57dc709de4bbd6999ed67ad9463a31ac6bb2a96 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Mon, 7 Sep 2020 22:38:43 +0300 Subject: [PATCH 4/4] cmake minimum version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d5af94e..fee1f3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16) +cmake_minimum_required(VERSION 3.15) cmake_policy(SET CMP0011 NEW) # don`t affect includer policies cmake_policy(SET CMP0017 NEW) # need include() with .cmake cmake_policy(SET CMP0020 NEW) # Automatically link Qt executables to qtmain target on Windows