Merge pull request #20 from mittorn/master

Global config

jni/Android.mk

@@ -4,34 +4,6 @@ override TARGET_arm_release_CFLAGS :=
 override TARGET_thumb_release_CFLAGS :=
 override TARGET_arm_debug_CFLAGS :=
 override TARGET_thumb_debug_CFLAGS :=
-
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a-hard)
-override TARGET_CFLAGS := $(CFLAGS_OPT) $(CFLAGS_OPT_ARM) $(CFLAGS_HARDFP)
-endif
-
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-override TARGET_CFLAGS := $(CFLAGS_OPT) $(CFLAGS_OPT_ARM)
-endif
-
-ifeq ($(TARGET_ARCH_ABI),armeabi)
-override TARGET_CFLAGS := $(CFLAGS_OPT) $(CFLAGS_OPT_ARMv5)
-endif
-
-ifeq ($(TARGET_ARCH_ABI),x86)
-override TARGET_CFLAGS := $(CFLAGS_OPT) $(CFLAGS_OPT_X86)
-endif
-
-# Compatibility trick, don't need all projects to be updated
-
-CFLAGS_OPT := 
-
-CFLAGS_OPT_ARM := 
-
-CFLAGS_OPT_ARMv5 := 
-
-CFLAGS_OPT_X86 := 
-
-CFLAGS_HARDFP := 
-
+override TARGET_CFLAGS :=
 
 include $(call all-subdir-makefiles)

jni/Application.mk

@@ -37,7 +37,9 @@ XASHXT_PATH := $(APPLICATIONMK_PATH)/src/XashXT/XashXT
 
 HLSDK_PATH  := $(APPLICATIONMK_PATH)/src/HLSDK/halflife/
 
-APP_ABI := x86 armeabi-v7a-hard
+XASH3D_CONFIG := $(APPLICATIONMK_PATH)/xash3d_config.mk
+
+APP_ABI := x86 armeabi armeabi-v7a-hard
 # Use armeabi-v7a to disable hardfloat, armeabi to build armv5 xash3d
 # Change CFLAGS_OPT_ARMv5 to "-mfloat-abi=softfp -mfpu=vfp" and fix setup.mk of ndk to build armv6
 # Mods are built with both ABI support

jni/xash3d_config.mk

@@ -0,0 +1,13 @@
+LOCAL_CFLAGS += $(CFLAGS_OPT)
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a-hard)
+LOCAL_CFLAGS += $(CFLAGS_OPT_ARM) $(CFLAGS_HARDFP)
+endif
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+LOCAL_CFLAGS += $(CFLAGS_OPT_ARM) -mfloat-abi=softfp
+endif
+ifeq ($(TARGET_ARCH_ABI),armeabi)
+LOCAL_CFLAGS += $(CFLAGS_OPT_ARMv5)
+endif
+ifeq ($(TARGET_ARCH_ABI),x86)
+LOCAL_CFLAGS += $(CFLAGS_OPT_X86)
+endif

res/layout/about.xml

@@ -44,7 +44,10 @@
             android:singleLine="false"
             android:password="false"
             android:longClickable="false"
-            android:autoText="false" />
+            android:autoText="false"
+            android:includeFontPadding="false"
+            android:layout_gravity="fill"
+             />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"