From: Peng Li Date: Tue, 17 Jul 2018 12:29:28 +0000 (+0800) Subject: Add libs support for linux x86_64 platform X-Git-Url: http://47.100.26.94:8080/?a=commitdiff_plain;h=135538c82b396ddcc3d87564b6be10083d8876f3;hp=2988acb907a5b0ad44e58dedb1e963f16d027436;p=trackerpp.git Add libs support for linux x86_64 platform --- diff --git a/test/SConscript b/test/SConscript index 7e05fba..ff200bc 100644 --- a/test/SConscript +++ b/test/SConscript @@ -1,11 +1,17 @@ import sys, os Import('env') - env1 = env.Clone() env1.Append(CPPPATH = ['#third_party/googletest/include']) -env1.Append(LIBPATH = ['#third_party/googletest/lib']) + +arch = os.uname()[4] +# Linux desktop or arm +if arch == 'x86_64': + env1.Append(LIBPATH = ['#third_party/googletest/lib/linux-x86_64']) +else: + env1.Append(LIBPATH = ['#third_party/googletest/lib']) + env1['LIBS'] = ['tracker', 'gtest', 'pthread'] obj = env1.Object(Glob("*.cpp")) diff --git a/third_party/googletest/lib/linux-x86_64/libgmock.a b/third_party/googletest/lib/linux-x86_64/libgmock.a new file mode 100644 index 0000000..8f02137 Binary files /dev/null and b/third_party/googletest/lib/linux-x86_64/libgmock.a differ diff --git a/third_party/googletest/lib/linux-x86_64/libgmock_main.a b/third_party/googletest/lib/linux-x86_64/libgmock_main.a new file mode 100644 index 0000000..5a1da7b Binary files /dev/null and b/third_party/googletest/lib/linux-x86_64/libgmock_main.a differ diff --git a/third_party/googletest/lib/linux-x86_64/libgtest.a b/third_party/googletest/lib/linux-x86_64/libgtest.a new file mode 100644 index 0000000..b387ab1 Binary files /dev/null and b/third_party/googletest/lib/linux-x86_64/libgtest.a differ diff --git a/third_party/googletest/lib/linux-x86_64/libgtest_main.a b/third_party/googletest/lib/linux-x86_64/libgtest_main.a new file mode 100644 index 0000000..5e0cdd2 Binary files /dev/null and b/third_party/googletest/lib/linux-x86_64/libgtest_main.a differ