From c44caae623a1150c8ca0825b9cddee31dc122342 Mon Sep 17 00:00:00 2001 From: Roman Khafizianov Date: Thu, 1 Jun 2023 15:56:05 +0200 Subject: [PATCH] fix makefile --- Makefile | 2 +- dist/.gitignore | 4 ++-- go.mod | 2 +- go.sum | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a38a69a65..8e16c7710 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ ifndef $(GOROOT) export GOROOT endif -export PATH:=deps:$(GOPATH)/bin:$(PATH) +export PATH:=$(pwd)/deps:$(GOPATH)/bin:$(PATH) all: @set -e; diff --git a/dist/.gitignore b/dist/.gitignore index 90c4eba33..7459acd93 100644 --- a/dist/.gitignore +++ b/dist/.gitignore @@ -1,6 +1,6 @@ server lib.a lib.h -ios/Lib.xcframework/ -android/lib.aar +ios/* +android/* cli \ No newline at end of file diff --git a/go.mod b/go.mod index ba2114ad1..234899a31 100644 --- a/go.mod +++ b/go.mod @@ -89,7 +89,7 @@ require ( go.uber.org/zap v1.24.0 golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 golang.org/x/image v0.6.0 - golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 + golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c golang.org/x/net v0.10.0 golang.org/x/oauth2 v0.8.0 golang.org/x/text v0.9.0 diff --git a/go.sum b/go.sum index 5a1b98488..b240a55b9 100644 --- a/go.sum +++ b/go.sum @@ -1029,8 +1029,9 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 h1:4+4C/Iv2U4fMZBiMCc98MG1In4gJY5YRhtpDNeDeHWs= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c h1:Gk61ECugwEHL6IiyyNLXNzmu8XslmRP2dS0xjIYhbb4= +golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c/go.mod h1:aAjjkJNdrh3PMckS4B10TGS2nag27cbKR1y2BpUxsiY= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=