From 4cdc7b93ddbded445bba2f3d75a80d80a1eb39a6 Mon Sep 17 00:00:00 2001 From: mittorn Date: Mon, 29 Feb 2016 20:12:50 +0000 Subject: [PATCH] Switch to new hlsdk --- .gitmodules | 3 +++ jni/Application.mk | 2 -- jni/src/HLSDK/Android.mk | 1 - jni/src/HLSDK/halflife | 1 - jni/src/hlsdk-client | 1 - jni/src/hlsdk-xash3d | 1 + 6 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 jni/src/HLSDK/Android.mk delete mode 160000 jni/src/HLSDK/halflife delete mode 160000 jni/src/hlsdk-client create mode 160000 jni/src/hlsdk-xash3d diff --git a/.gitmodules b/.gitmodules index b7938051..a134a82f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "jni/src/hlsdk-client"] path = jni/src/hlsdk-client url = https://github.com/SDLash3D/hlsdk-client +[submodule "jni/src/hlsdk-xash3d"] + path = jni/src/hlsdk-xash3d + url = https://github.com/SDLash3D/hlsdk-xash3d diff --git a/jni/Application.mk b/jni/Application.mk index e746e2b4..299cb32e 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -23,8 +23,6 @@ NANOGL_PATH := $(APPLICATIONMK_PATH)/src/NanoGL/nanogl XASH3D_PATH := $(APPLICATIONMK_PATH)/src/Xash3D/xash3d -XASHXT_PATH := $(APPLICATIONMK_PATH)/src/XashXT/XashXT - HLSDK_PATH := $(APPLICATIONMK_PATH)/src/HLSDK/halflife/ XASH3D_CONFIG := $(APPLICATIONMK_PATH)/xash3d_config.mk diff --git a/jni/src/HLSDK/Android.mk b/jni/src/HLSDK/Android.mk deleted file mode 100644 index 5053e7d6..00000000 --- a/jni/src/HLSDK/Android.mk +++ /dev/null @@ -1 +0,0 @@ -include $(call all-subdir-makefiles) diff --git a/jni/src/HLSDK/halflife b/jni/src/HLSDK/halflife deleted file mode 160000 index 0e9f18de..00000000 --- a/jni/src/HLSDK/halflife +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0e9f18de0b93a7e0d790b4bc02a1e3402ff7deb3 diff --git a/jni/src/hlsdk-client b/jni/src/hlsdk-client deleted file mode 160000 index 362e31a0..00000000 --- a/jni/src/hlsdk-client +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 362e31a0fff80501c67ebff41e2be5d5a178b408 diff --git a/jni/src/hlsdk-xash3d b/jni/src/hlsdk-xash3d new file mode 160000 index 00000000..ac857199 --- /dev/null +++ b/jni/src/hlsdk-xash3d @@ -0,0 +1 @@ +Subproject commit ac857199cf7ba046cbd9856c18fce26a680b0c4c