From b2e9f682d11341bde0ff63b786cef1f391c60901 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Sat, 8 Feb 2020 16:50:12 +0100 Subject: [PATCH] Update stuff --- build-helpers | 2 +- build_client.sh | 2 +- build_shared.sh | 2 +- scripts | 1 - shared | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) delete mode 160000 scripts diff --git a/build-helpers b/build-helpers index 8bbac44..c212df4 160000 --- a/build-helpers +++ b/build-helpers @@ -1 +1 @@ -Subproject commit 8bbac44210cbf28c1a867a80b3fb3a0c7ed8cc88 +Subproject commit c212df42345816ea0e73cd466718f75d9926c4a2 diff --git a/build_client.sh b/build_client.sh index 11e7496..9c9209a 100755 --- a/build_client.sh +++ b/build_client.sh @@ -6,7 +6,7 @@ export tearoot_cmake_config="`pwd`/build-helpers/cmake/config/tearoot-client.cma export tearoot_cmake_module="`pwd`/build-helpers/cmake/" export traroot_library="`pwd`/third_party" -source scripts/build_helper.sh +source build-helpers/build_helper.sh begin_task "build_client" "Building client" ./client/jenkins/create_build.sh diff --git a/build_shared.sh b/build_shared.sh index 4cf6c67..405a3e2 100755 --- a/build_shared.sh +++ b/build_shared.sh @@ -8,7 +8,7 @@ tearoot_cmake_module="`pwd`/build-helpers/cmake/" traroot_library="`pwd`/third_party" shared_path="shared" -source `pwd`/scripts/build_helper.sh +source `pwd`/build-helpers/build_helper.sh begin_task "build_shared" "Building shared library" requires_rebuild ${shared_path} [[ $? -eq 0 ]] && { diff --git a/scripts b/scripts deleted file mode 160000 index 0b83e74..0000000 --- a/scripts +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0b83e74e2df4b084d256ea3cea0be64e01ef6da3 diff --git a/shared b/shared index 2853152..3f57ad4 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 28531523c483ce2d4dd9bfbde8121957c0124f19 +Subproject commit 3f57ad4678dd1ef1c72a066cc4fdd7bedb84c172