From 10ad59090e9b2183b93ceeb89f664907b9d5848a Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Mon, 26 Aug 2019 19:17:23 +0300 Subject: [PATCH 1/2] Fix build on Linux with '--platform linux_64' flag --- make | 7 +++++-- scripts/deploy | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/make b/make index 6cf1471..b26467b 100755 --- a/make +++ b/make @@ -74,12 +74,15 @@ IS_NEED_64=true IS_NEED_32=true fi -if [[ "$OO_PLATFORM" == *"x64"* ]] || [[ "$OO_PLATFORM" == *"linux_64"* ]] || [[ "$OO_PLATFORM" == *"mac_64"* ]] +if [[ "$OO_PLATFORM" == *"x64"* ]] || \ + [[ "$OO_PLATFORM" == *"linux_64"* ]] || \ + [[ "$OO_PLATFORM" == *"mac_64"* ]] then IS_NEED_64=true fi -if [[ "$OO_PLATFORM" == *"x86"* ]] || [[ "$OO_PLATFORM" == *"linux_32"* ]] +if [[ "$OO_PLATFORM" == *"x86"* ]] || \ + [[ "$OO_PLATFORM" == *"linux_32"* ]] then IS_NEED_32=true fi diff --git a/scripts/deploy b/scripts/deploy index 4dec53b..776d6c2 100755 --- a/scripts/deploy +++ b/scripts/deploy @@ -17,12 +17,15 @@ then IS_NEED_32=true fi -if [[ "$OO_PLATFORM" == *"x64"* ]] +if [[ "$OO_PLATFORM" == *"x64"* ]] || \ + [[ "$OO_PLATFORM" == *"linux_64"* ]] || \ + [[ "$OO_PLATFORM" == *"mac_64"* ]] then IS_NEED_64=true fi -if [[ "$OO_PLATFORM" == *"x86"* ]] +if [[ "$OO_PLATFORM" == *"x86"* ]] || \ + [[ "$OO_PLATFORM" == *"linux_32"* ]] then IS_NEED_32=true fi From 70648ecf2099d714d99ed8a9f64752a6f03bb460 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Mon, 26 Aug 2019 19:17:59 +0300 Subject: [PATCH 2/2] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ef1ed42..4bfbcd6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ out/ makefiles/ .qmake.stash -config.json \ No newline at end of file +config