From 962bcc734f58ac988a4728903bd080cddc38fb2c Mon Sep 17 00:00:00 2001 From: andrey Date: Tue, 8 Sep 2020 10:27:23 +0300 Subject: [PATCH] README.md and cmake version --- CMakeLists.txt | 2 +- README.md | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fee1f3e..e6e590c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.13) 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 diff --git a/README.md b/README.md index 1e67437..d50851c 100644 --- a/README.md +++ b/README.md @@ -61,16 +61,18 @@ Build steps: Build steps for both architectures: - -- follow previos steps, but on '4' state run make_libs_all.bat + -- follow previos steps, but on '5' state run make_libs_all.bat ## Non-Windows scripts 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 -and make docker image "libs" with installed SHS SDK for: -* Debian 10 -* Windows x64 -* MacOS -* Android ndk 21 armeabi-v71, arm64-v8a, x86, x86_64 +This repo provide Dockerfile, e.q. so you can exec `docker build -t windows-shstk docker\windows-shstk` +and make docker image "windows-shstk" with installed SHS SDK for Windows. Similar for other platforms. +Dockerfile provide for platforms: +* Debian 10 (debian-shstk) +* Windows x64 (windows-shstk) +* MacOS (osx-shstk) +* Raspberry Pi raspbean (pi-shstk) +* Android ndk 21 armeabi-v71, arm64-v8a, x86, x86_64 (android-shstk)