diff --git a/.gitignore b/.gitignore index 8a382b51..6f310b42 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ -libs -obj -bin -gen - -local.properties - +libs +obj +bin +gen + +local.properties + diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b8ed3016..cf81d0cc 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,51 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/README.md b/README.md index 8c1f4b33..b247d2f7 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -==== -Xash3D Android project -==== - -Just put into jni/src/XXXX/ a symlink to a repository. For example, for HLSDK it will be jni/src/HLSDK/halflife/ - -Write here any issues related to Android port. +==== +Xash3D Android project +==== + +Just put into jni/src/XXXX/ a symlink to a repository. For example, for HLSDK it will be jni/src/HLSDK/halflife/ + +Write here any issues related to Android port. diff --git a/ant.properties b/ant.properties index a51e6a08..b0971e89 100644 --- a/ant.properties +++ b/ant.properties @@ -1,17 +1,17 @@ -# This file is used to override default values used by the Ant build system. -# -# This file must be checked into Version Control Systems, as it is -# integral to the build system of your project. - -# This file is only used by the Ant script. - -# You can use this to override default values such as -# 'source.dir' for the location of your java source folder and -# 'out.dir' for the location of your output folder. - -# You can also use it define how the release builds are signed by declaring -# the following properties: -# 'key.store' for the location of your keystore and -# 'key.alias' for the name of the key to use. -# The password will be asked during the build when you use the 'release' target. - +# This file is used to override default values used by the Ant build system. +# +# This file must be checked into Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + diff --git a/assets/License.txt b/assets/License.txt index c9f1a93b..ed2ae8aa 100644 --- a/assets/License.txt +++ b/assets/License.txt @@ -1,4 +1,4 @@ -These PNG files are copyright to Emile Belanger. -They are permitted for use in SDLxash3D Android port, full copyright is owned by Emile Belanger. -Other use not permitted without permission from Emile Belanger. +These PNG files are copyright to Emile Belanger. +They are permitted for use in SDLxash3D Android port, full copyright is owned by Emile Belanger. +Other use not permitted without permission from Emile Belanger. emile.belanger@gmail.com \ No newline at end of file diff --git a/build.properties b/build.properties index 7886684f..edc7f230 100644 --- a/build.properties +++ b/build.properties @@ -1,17 +1,17 @@ -# This file is used to override default values used by the Ant build system. -# -# This file must be checked in Version Control Systems, as it is -# integral to the build system of your project. - -# This file is only used by the Ant script. - -# You can use this to override default values such as -# 'source.dir' for the location of your java source folder and -# 'out.dir' for the location of your output folder. - -# You can also use it define how the release builds are signed by declaring -# the following properties: -# 'key.store' for the location of your keystore and -# 'key.alias' for the name of the key to use. -# The password will be asked during the build when you use the 'release' target. - +# This file is used to override default values used by the Ant build system. +# +# This file must be checked in Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + diff --git a/build.sh b/build.sh index 680c168d..70eb6c3f 100755 --- a/build.sh +++ b/build.sh @@ -1,8 +1,8 @@ -#!/bin/sh - -ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=0 SUPPORT_WEBP=false V=1 -ant release -#jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../myks.keystore bin/xashdroid-release-unsigned.apk xashdroid -#adb install -r -f bin/xashdroid-debug.apk -rm bin/xashdroid-release.apk -/opt/android-sdk-update-manager/build-tools/19.1.0/zipalign 4 bin/xashdroid-release-unsigned.apk bin/xashdroid-release.apk +#!/bin/sh + +ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=0 SUPPORT_WEBP=false V=1 +ant release +#jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../myks.keystore bin/xashdroid-release-unsigned.apk xashdroid +#adb install -r -f bin/xashdroid-debug.apk +rm bin/xashdroid-release.apk +/opt/android-sdk-update-manager/build-tools/19.1.0/zipalign 4 bin/xashdroid-release-unsigned.apk bin/xashdroid-release.apk diff --git a/build.xml b/build.xml index de3e3f1e..96cb7ec6 100644 --- a/build.xml +++ b/build.xml @@ -1,92 +1,92 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/debug.sh b/debug.sh index 0db41f42..4a895508 100755 --- a/debug.sh +++ b/debug.sh @@ -1,8 +1,8 @@ -#!/bin/sh - -ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=1 SUPPORT_WEBP=false V=1 -j3 APP_CFLAGS="-gdwarf-3" -ant debug -#jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../myks.keystore bin/xashdroid-release-unsigned.apk xashdroid -storepass 529459 -adb install -r -f bin/xashdroid-debug.apk -#rm bin/xashdroid-release.apk -#/opt/android-sdk-update-manager/build-tools/19.1.0/zipalign 4 bin/xashdroid-release-unsigned.apk bin/xashdroid-release.apk +#!/bin/sh + +ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=1 SUPPORT_WEBP=false V=1 -j3 APP_CFLAGS="-gdwarf-3" +ant debug +#jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../myks.keystore bin/xashdroid-release-unsigned.apk xashdroid -storepass 529459 +adb install -r -f bin/xashdroid-debug.apk +#rm bin/xashdroid-release.apk +#/opt/android-sdk-update-manager/build-tools/19.1.0/zipalign 4 bin/xashdroid-release-unsigned.apk bin/xashdroid-release.apk diff --git a/default.properties b/default.properties index 0d39a1b6..0cdab956 100644 --- a/default.properties +++ b/default.properties @@ -1,11 +1,11 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "build.properties", and override values to adapt the script to your -# project structure. - -# Project target. -target=android-12 +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system use, +# "build.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=android-12 diff --git a/jni/Android.mk b/jni/Android.mk index 7ae3545f..5053e7d6 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1 +1 @@ -include $(call all-subdir-makefiles) +include $(call all-subdir-makefiles) diff --git a/jni/Application.mk b/jni/Application.mk index cd700236..4d2374fd 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,29 +1,29 @@ - -# Uncomment this if you're using STL in your project -# See CPLUSPLUS-SUPPORT.html in the NDK documentation for more information - APP_STL := stlport_static - - - -APPLICATIONMK_PATH = $(call my-dir) - -ifeq ($(EMILE),1) -SDL_PATH := $(APPLICATIONMK_PATH)/src/SDL-mirror -else -SDL_PATH := $(APPLICATIONMK_PATH)/src/SDL2 -endif - - -TOUCHCONTROLS_PATH := $(APPLICATIONMK_PATH)/src/MobileTouchControls - - -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/ - -APP_ABI := armeabi-v7a x86 -APP_MODULES := SDL2 xash menu client server NanoGL + +# Uncomment this if you're using STL in your project +# See CPLUSPLUS-SUPPORT.html in the NDK documentation for more information + APP_STL := stlport_static + + + +APPLICATIONMK_PATH = $(call my-dir) + +ifeq ($(EMILE),1) +SDL_PATH := $(APPLICATIONMK_PATH)/src/SDL-mirror +else +SDL_PATH := $(APPLICATIONMK_PATH)/src/SDL2 +endif + + +TOUCHCONTROLS_PATH := $(APPLICATIONMK_PATH)/src/MobileTouchControls + + +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/ + +APP_ABI := armeabi-v7a x86 +APP_MODULES := SDL2 xash menu client server NanoGL diff --git a/jni/src/Android.mk b/jni/src/Android.mk index 7ae3545f..5053e7d6 100644 --- a/jni/src/Android.mk +++ b/jni/src/Android.mk @@ -1 +1 @@ -include $(call all-subdir-makefiles) +include $(call all-subdir-makefiles) diff --git a/jni/src/HLSDK/Android.mk b/jni/src/HLSDK/Android.mk index 7ae3545f..5053e7d6 100644 --- a/jni/src/HLSDK/Android.mk +++ b/jni/src/HLSDK/Android.mk @@ -1 +1 @@ -include $(call all-subdir-makefiles) +include $(call all-subdir-makefiles) diff --git a/jni/src/NanoGL/Android.mk b/jni/src/NanoGL/Android.mk index 7ae3545f..5053e7d6 100644 --- a/jni/src/NanoGL/Android.mk +++ b/jni/src/NanoGL/Android.mk @@ -1 +1 @@ -include $(call all-subdir-makefiles) +include $(call all-subdir-makefiles) diff --git a/jni/src/Xash3D/Android.mk b/jni/src/Xash3D/Android.mk index 7ae3545f..5053e7d6 100644 --- a/jni/src/Xash3D/Android.mk +++ b/jni/src/Xash3D/Android.mk @@ -1 +1 @@ -include $(call all-subdir-makefiles) +include $(call all-subdir-makefiles) diff --git a/jni/src/XashXT/Android.mk b/jni/src/XashXT/Android.mk index 7ae3545f..5053e7d6 100644 --- a/jni/src/XashXT/Android.mk +++ b/jni/src/XashXT/Android.mk @@ -1 +1 @@ -include $(call all-subdir-makefiles) +include $(call all-subdir-makefiles) diff --git a/proguard-project.txt b/proguard-project.txt index b60ae7ea..f2fe1559 100644 --- a/proguard-project.txt +++ b/proguard-project.txt @@ -1,20 +1,20 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} +# To enable ProGuard in your project, edit project.properties +# to define the proguard.config property as described in that file. +# +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ${sdk.dir}/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the ProGuard +# include property in project.properties. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/res/drawable/layout_sel_background.xml b/res/drawable/layout_sel_background.xml index ec60aefc..a50c6766 100644 --- a/res/drawable/layout_sel_background.xml +++ b/res/drawable/layout_sel_background.xml @@ -1,17 +1,17 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/res/layout/controls_listview_item.xml b/res/layout/controls_listview_item.xml index ebe20a34..2bbead9d 100644 --- a/res/layout/controls_listview_item.xml +++ b/res/layout/controls_listview_item.xml @@ -1,42 +1,42 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/edit_controls_listview_item.xml b/res/layout/edit_controls_listview_item.xml index fbf3bfc2..0317d239 100644 --- a/res/layout/edit_controls_listview_item.xml +++ b/res/layout/edit_controls_listview_item.xml @@ -1,34 +1,34 @@ - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/fragment_gamepad.xml b/res/layout/fragment_gamepad.xml index cee6ae9b..d4ba93c2 100644 --- a/res/layout/fragment_gamepad.xml +++ b/res/layout/fragment_gamepad.xml @@ -1,49 +1,49 @@ - - - - - - - - -