From e6d1ef313e60d330fed5f735b7d614c32aca539b Mon Sep 17 00:00:00 2001 From: swg Date: Tue, 9 Apr 2019 04:44:59 -0400 Subject: [PATCH] Added dependencies sub-module --- .gitignore | 1 - .gitmodules | 5 ++++- build.properties | 1 + build.xml | 4 +++- clientdata | 2 +- dsrc | 2 +- src | 2 +- 7 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3655760..9ac2775 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ build/ chat/ configs/ data/ -dependencies/ miff/ .setup local.properties diff --git a/.gitmodules b/.gitmodules index e8cf90d..e39f92e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,4 +14,7 @@ path = exe url = https://github.com/SWG-Source/configs.git ignore = dirty - +[submodule "dependencies"] + path = dependencies + url = https://github.com/SWG-Source/dependencies.git + ignore = dirty diff --git a/build.properties b/build.properties index f91ceca..9a20683 100755 --- a/build.properties +++ b/build.properties @@ -23,6 +23,7 @@ src_branch = master dsrc_branch = master clientdata_branch = master configs_branch = master +dependencies_branch = master # SRC Compilation compiler = gcc diff --git a/build.xml b/build.xml index ef05e50..8a39765 100755 --- a/build.xml +++ b/build.xml @@ -25,7 +25,8 @@ - + + @@ -126,6 +127,7 @@ + diff --git a/clientdata b/clientdata index ca6a721..e7d8e11 160000 --- a/clientdata +++ b/clientdata @@ -1 +1 @@ -Subproject commit ca6a721d2f8d2e669657cb5fa81b7f154e775c74 +Subproject commit e7d8e11208d249f43b96dd78c46f090820eca776 diff --git a/dsrc b/dsrc index df0987e..a8cd432 160000 --- a/dsrc +++ b/dsrc @@ -1 +1 @@ -Subproject commit df0987e868f0782fb3395cbf3dbaee66c60d396d +Subproject commit a8cd4325cd095057c86e13add574b95c1e1de69b diff --git a/src b/src index a86389b..f36ee7e 160000 --- a/src +++ b/src @@ -1 +1 @@ -Subproject commit a86389b602c9fc617ea73fe386b7ed75970c8641 +Subproject commit f36ee7ed77506b1efbbabf6e9021e70e15bb219f