vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move project to git-submodules

Browse source
This commit is contained in:
a1batross 2015-09-06 12:45:59 +03:00
parent f0fd46bb60
commit e8d98a5d71
9 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.gitignore vendored
View file

@ -3,13 +3,6 @@ obj
bin
gen
jni/src/HLSDK/halflife
jni/src/NanoGL/nanogl
jni/src/SDL2/SDL-mirrir
jni/src/Xash3D/xash3d
jni/src/XashXT/XashXT
jni/src/MobileTouchControls/MobileTouchControls
local.properties
res/values/git-rev.xml

18
.gitmodules vendored Normal file
View file

@ -0,0 +1,18 @@
[submodule "jni/src/HLSDK/halflife"]
path = jni/src/HLSDK/halflife
url = https://github.com/SDLash3D/halflife
[submodule "jni/src/MobileTouchControls/MobileTouchControls"]
path = jni/src/MobileTouchControls/MobileTouchControls
url = https://github.com/SDLash3D/MobileTouchControls
[submodule "jni/src/NanoGL/nanogl"]
path = jni/src/NanoGL/nanogl
url = https://github.com/SDLash3D/nanogl
[submodule "jni/src/SDL2/SDL-mirror"]
path = jni/src/SDL2/SDL-mirror
url = https://github.com/mittorn/SDL-mirror
[submodule "jni/src/Xash3D/xash3d"]
path = jni/src/Xash3D/xash3d
url = https://github.com/SDLash3D/xash3d
[submodule "jni/src/XashXT/XashXT"]
path = jni/src/XashXT/XashXT
url = https://github.com/SDLash3D/XashXT

8
.travis.yml
View file

@ -16,12 +16,8 @@ before_install:
- chmod +x android-ndk-r10e-linux-x86_64.bin && ./android-ndk-r10e-linux-x86_64.bin > /dev/null
- mv android-ndk-r10e android-ndk
- export PATH=`pwd`/android-ndk:`pwd`/android-sdk-linux/tools:`pwd`/android-sdk-linux/platform-tools:$PATH
- git clone -q --depth=1 https://github.com/SDLash3D/xash3d jni/src/Xash3D/xash3d
- git clone -q --depth=1 https://github.com/SDLash3D/halflife jni/src/HLSDK/halflife
- git clone -q --depth=1 https://github.com/SDLash3D/MobileTouchControls jni/src/MobileTouchControls/MobileTouchControls
- git clone -q --depth=1 https://github.com/SDLash3D/nanogl jni/src/NanoGL/nanogl
- git clone -q --depth=1 https://github.com/SDLash3D/XashXT jni/src/XashXT/XashXT
- git clone -q --depth=1 https://github.com/mittorn/SDL-mirror jni/src/SDL2/SDL-mirror
- git submodule init
- git submodule update
- sed -i -- s/android-8/android-15/g project.properties
script:
- sh gen-version.sh travis build

1
jni/src/HLSDK/halflife Submodule

@ -0,0 +1 @@
Subproject commit 235f2f448f5cab7251206f8ff1f242e30346a4d4

1
jni/src/MobileTouchControls/MobileTouchControls Submodule

@ -0,0 +1 @@
Subproject commit eefe7bc11c4b94e2e5ecdf761bc6a52d236b11c6

1
jni/src/NanoGL/nanogl Submodule

@ -0,0 +1 @@
Subproject commit 5ea04e4036c1b08a520699d8f3da32be31797625

1
jni/src/SDL2/SDL-mirror Submodule

@ -0,0 +1 @@
Subproject commit 1f0b6ddc873a99f1bec8a4556c86bd7b6d5a85e3

1
jni/src/Xash3D/xash3d Submodule

@ -0,0 +1 @@
Subproject commit cb6992d29a29d9e7ada0ba8f301ed8e136551b69

1
jni/src/XashXT/XashXT Submodule

@ -0,0 +1 @@
Subproject commit ddd34947fb704777cbcdbc39e1883fb6df3187ce