diff --git a/Projects/Android/jni/Application.mk b/Projects/Android/jni/Application.mk index 8e03e58..a65eba1 100644 --- a/Projects/Android/jni/Application.mk +++ b/Projects/Android/jni/Application.mk @@ -30,7 +30,7 @@ HLSDK_PATH := $(APPLICATIONMK_PATH)/src/HLSDK/halflife/ # step will error as we currently remove prebuilt artifacts on clean. APP_ALLOW_MISSING_DEPS=true -APP_MODULES := gl4es xash menu client server client_opfor server_opfor client_aomdc server_aomdc client_theyhunger server_theyhunger +APP_MODULES := gl4es xash menu client server client_bshift server_bshift client_opfor server_opfor client_aomdc server_aomdc client_theyhunger server_theyhunger APP_STL := c++_shared diff --git a/Projects/Android/jni/src/hlsdk-xash3d b/Projects/Android/jni/src/hlsdk-xash3d index 27b014d..55805f5 160000 --- a/Projects/Android/jni/src/hlsdk-xash3d +++ b/Projects/Android/jni/src/hlsdk-xash3d @@ -1 +1 @@ -Subproject commit 27b014d21bff88a3bd16e86c1799bd22bace0f28 +Subproject commit 55805f53d1edf78f1526846e4f75e7aedaefed4f diff --git a/java/com/drbeef/lambda1vr/GLES3JNIActivity.java b/java/com/drbeef/lambda1vr/GLES3JNIActivity.java index 28a50bb..1c8aac8 100644 --- a/java/com/drbeef/lambda1vr/GLES3JNIActivity.java +++ b/java/com/drbeef/lambda1vr/GLES3JNIActivity.java @@ -489,6 +489,10 @@ import static android.system.Os.setenv; //Use pipewrench as backpack weapon in opposing force setenv("VR_BACKPACK_WEAPON", "weapon_pipewrench", true); } + else if (game.equalsIgnoreCase("bshift")) + { + setenv("XASH3D_LIBSUFFIX", "_bshift", true); + } else if (game.equalsIgnoreCase("aomdc")) { setenv("XASH3D_LIBSUFFIX", "_aomdc", true);